Browse Source

Merge branch 'master' of http://192.168.1.200/lxc/Iot

master
谕仙 2 years ago
parent
commit
51d0f0d668
  1. 2
      lpro/src/main/java/com/lp/authority/AuthorityIntercept.java
  2. 16
      lpro/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java

2
lpro/src/main/java/com/lp/authority/AuthorityIntercept.java

@ -45,7 +45,7 @@ public class AuthorityIntercept {
requestUrl.contains("/validate/code") || requestUrl.contains("/security_code") || requestUrl.contains("/upload") requestUrl.contains("/validate/code") || requestUrl.contains("/security_code") || requestUrl.contains("/upload")
|| requestUrl.contains("/mail") || requestUrl.contains("/bind") || requestUrl.contains("/live") || || requestUrl.contains("/mail") || requestUrl.contains("/bind") || requestUrl.contains("/live") ||
requestUrl.contains("/mqtt") || requestUrl.contains("/baidu") || requestUrl.contains("/vp") ||requestUrl.contains("/noauth") requestUrl.contains("/mqtt") || requestUrl.contains("/baidu") || requestUrl.contains("/vp") ||requestUrl.contains("/noauth")
|| requestUrl.endsWith("/") || requestUrl.contains("/dictionary")) { || requestUrl.endsWith("/") || requestUrl.contains("/dictionary") || requestUrl.contains("/api")) {
return true; return true;
} else { } else {

16
lpro/src/main/java/com/lp/controller/iot/IotVisualMoudleInfoController.java

@ -24,7 +24,21 @@ import java.util.Map;
@Controller @Controller
public class IotVisualMoudleInfoController extends BaseController public class IotVisualMoudleInfoController extends BaseController
{ {
@RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST}, value={"/page/moudle/visual"}) @RequestMapping(method={ org.springframework.web.bind.annotation.RequestMethod.GET }, value={"/api/moudle/visual"})
public ModelAndView selectPageEAPI(HttpServletResponse response, @RequestParam(required=false) Integer pageSize, @RequestParam(required=false) Integer paged)
{
Map resultMap = getResultMap();
IotVisualMoudleInfoBO obj =new IotVisualMoudleInfoBO();
try {
resultMap = this.service.selectPageList("IotVisualMoudleInfo.selectPage", getPageBean(paged, pageSize), obj, new Object[0]);
} catch (Exception e) {
exception(e, resultMap, new Object[] { obj });
}
return getModelAndView(response, resultMap);
}
@RequestMapping(method={org.springframework.web.bind.annotation.RequestMethod.POST,org.springframework.web.bind.annotation.RequestMethod.GET }, value={"/page/moudle/visual"})
public ModelAndView selectPage(HttpServletResponse response, @RequestHeader(value="USER-KEY", required=true) String userKey, @RequestBody IotVisualMoudleInfoBO obj, @RequestParam(required=false) Integer pageSize, @RequestParam Integer paged) public ModelAndView selectPage(HttpServletResponse response, @RequestHeader(value="USER-KEY", required=true) String userKey, @RequestBody IotVisualMoudleInfoBO obj, @RequestParam(required=false) Integer pageSize, @RequestParam Integer paged)
{ {
Map resultMap = getResultMap(); Map resultMap = getResultMap();

Loading…
Cancel
Save