diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index 1697ddf09..de57edfb1 100644 --- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -125,7 +125,7 @@ public class ServiceDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) + @RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) @RequestMapping(value={"form"}) public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) { if(doAction!=null&&doAction.equals("0")){ @@ -149,7 +149,7 @@ public class ServiceDictInfoController extends BaseController { * @param redirectAttributes * @return */ - @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) { @@ -173,7 +173,7 @@ public class ServiceDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR) @RequestMapping(value={"delete"}) public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { try { diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index 18efeda85..dc4ac98fd 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -121,7 +121,7 @@ public class SysDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit","basics:area:view","basics:isp:view","basics:scope:view"},logical=Logical.OR) + @RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit","basics:area:view","basics:isp:view","basics:scope:view"},logical=Logical.OR) @RequestMapping(value={"form"}) public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) { if(doAction!=null&&doAction.equals("0")){ @@ -149,7 +149,7 @@ public class SysDictInfoController extends BaseController { * @param redirectAttributes * @return */ - @RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) { @@ -170,7 +170,7 @@ public class SysDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:area:del","basics:isp:del","basics:scope:del"},logical=Logical.OR) @RequestMapping(value={"delete"}) public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { try { diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index 809eefd7e..b6d5a5742 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -119,7 +119,7 @@ public class SpecificServiceCfgController extends BaseController { * @param mulitId * @return */ - @RequiresPermissions(value={"specific:service:edit","specific:service:view"},logical=Logical.OR) + @RequiresPermissions(value={"specific:service:add","specific:service:edit","specific:service:view"},logical=Logical.OR) @RequestMapping(value = { "form" }) public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction) { if(specificServiceCfg!=null&&specificServiceCfg.getSpecServiceId()!=null){ @@ -144,7 +144,7 @@ public class SpecificServiceCfgController extends BaseController { * @param redirectAttributes * @return */ - @RequiresPermissions("specific:service:edit") + @RequiresPermissions(value= {"specific:service:add","specific:service:edit"},logical=Logical.OR) @RequestMapping(value="saveOrUpdate") public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model, RedirectAttributes redirectAttributes,Integer oldId) { @@ -165,7 +165,7 @@ public class SpecificServiceCfgController extends BaseController { * @param mulitId * @return */ - @RequiresPermissions("specific:service:edit") + @RequiresPermissions("specific:service:del") @RequestMapping(value="delete") public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){ try{ diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index 1bc9e15df..7e7133d49 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -67,7 +68,7 @@ public class SpecificServiceHostCfgController extends BaseController { * @param model * @return */ - @RequiresPermissions("specific:serviceIp:edit") + @RequiresPermissions(value= {"specific:serviceIp:add","specific:serviceIp:edit"},logical=Logical.OR) @RequestMapping(value = "form") public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) { //查询协议id供下拉选择 @@ -84,7 +85,7 @@ public class SpecificServiceHostCfgController extends BaseController { * @param mulitId * @return */ - @RequiresPermissions("specific:serviceIp:edit") + @RequiresPermissions(value= {"specific:serviceIp:add","specific:serviceIp:edit"},logical=Logical.OR) @RequestMapping(value = "saveOrUpdate") public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){ try { @@ -103,7 +104,7 @@ public class SpecificServiceHostCfgController extends BaseController { * @param mulitId * @return */ - @RequiresPermissions("specific:serviceIp:edit") + @RequiresPermissions("specific:serviceIp:del") @RequestMapping(value="delete") public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){ try{ diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 31a28f180..225c1cc6a 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -109,7 +109,7 @@
@@ -181,9 +181,11 @@ + + - + " href="javascript:;"> diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 1e05e24a6..f2d742c16 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -129,7 +129,7 @@