diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f38414a09..a0266aa58 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1,5 +1,4 @@ package com.nis.web.controller; - import java.beans.PropertyEditorSupport; import java.io.IOException; import java.util.Date; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 3ff4618c0..e5f70d325 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; @@ -133,7 +132,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -152,7 +151,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 29b3a7003..987907616 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -41,8 +42,9 @@ public class IpCfgController extends BaseController{ } @RequestMapping(value = {"list"}) - public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(ipCfg!=null){ Integer serviceId=ipCfg.getServiceId(); logger.info("servcice id is "+serviceId); @@ -131,6 +133,7 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgForm"; } + @RequiresPermissions("sys:cfg:edit") @RequestMapping(value = {"updateForm"}) public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); @@ -144,7 +147,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -164,7 +167,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -319,6 +322,7 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ + @RequiresPermissions("sys:cfg:edit") @RequestMapping(value = {"deleteCfg"}) public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { model.addAttribute("cfgName", cfgName); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 32ad4c922..86491356b 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; @@ -109,7 +108,7 @@ public class NumCfgController extends BaseController{ searchBean.setCfgId(cfgId); NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index e788bd1ee..ac11ffc3f 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; @@ -133,7 +132,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -152,7 +151,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 73b15b9dd..46d5b6533 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -6,7 +6,7 @@
-
+
+
-
+
@@ -79,7 +80,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index 7ea6a1462..b720a1281 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -10,6 +10,7 @@
+
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 315838877..1e5aee1c1 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -5,21 +5,23 @@
-
- +
+
+
-
+
-
+
+
@@ -27,17 +29,19 @@
-
+
+
-
+
+
@@ -45,17 +49,19 @@
-
+
+
-
+
+
@@ -63,17 +69,19 @@
-
+
+
-
+
+
@@ -81,17 +89,19 @@
-
+
+
-
+
+
@@ -99,19 +109,20 @@
-
+
<%-- --%>
+
-
+
<%-- --%>
+
@@ -126,15 +138,15 @@
-
+
- -
+
+
checked @@ -165,14 +177,16 @@ <%-- --%>
+
-
+
+
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index 84ff30ca2..b260b5dee 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -61,7 +61,7 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 9fb9d54cb..a968c56c9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -5,6 +5,20 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + + + + +