diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index c94ecc550..f6cb701d0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -54,7 +54,7 @@ public class AvContentController extends BaseController { /*****************************voip业务***************/ //音视频VOIP IP配置新增界面 @RequestMapping(value = {"/voipForm"}) - @RequiresPermissions(value={"avVoip:config"}) + @RequiresPermissions(value={"avVoipIp:config"}) public String voipFrom(Model model,HttpServletRequest request ,HttpServletResponse response ,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ @@ -70,7 +70,7 @@ public class AvContentController extends BaseController { } //音视频VOIP Account配置新增界面 @RequestMapping(value = {"/voipAccountForm"}) - @RequiresPermissions(value={"avVoip:config"}) + @RequiresPermissions(value={"avVoipAccount:config"}) public String voipAccountForm(Model model,HttpServletRequest request ,HttpServletResponse response ,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){ //修改 @@ -165,7 +165,7 @@ public class AvContentController extends BaseController { //修改VOIP IP配置状态 @RequestMapping(value = {"/updateAvVoipValid"}) - @RequiresPermissions(value={"avVoip:config"}) + @RequiresPermissions(value={"avVoipIp:config"}) public String updateVoipValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId ,RedirectAttributes redirectAttributes ) { @@ -186,7 +186,7 @@ public class AvContentController extends BaseController { } //修改VOIP account配置状态 @RequestMapping(value = {"/updateAvVoipAccountValid"}) - @RequiresPermissions(value={"avVoip:config"}) + @RequiresPermissions(value={"avVoipAccount:config"}) public String updateVoipAccountValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId ,RedirectAttributes redirectAttributes ) { @@ -207,7 +207,7 @@ public class AvContentController extends BaseController { } //修改VOIP IP配置审核状态 @RequestMapping(value = {"/auditAvVoip"}) - @RequiresPermissions(value={"avVoip:confirm"}) + @RequiresPermissions(value={"avVoipIp:confirm"}) public String auditVoip(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId ,RedirectAttributes redirectAttributes) { @@ -236,7 +236,7 @@ public class AvContentController extends BaseController { } //修改VOIP IP配置审核状态 @RequestMapping(value = {"/auditAvVoipAccount"}) - @RequiresPermissions(value={"avVoip:confirm"}) + @RequiresPermissions(value={"avVoipAccount:confirm"}) public String auditVoipAccount(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId ,RedirectAttributes redirectAttributes) { diff --git a/src/main/resources/sql/20180913/update-sys_menu-voip.sql b/src/main/resources/sql/20180913/update-sys_menu-voip.sql new file mode 100644 index 000000000..a9080ac42 --- /dev/null +++ b/src/main/resources/sql/20180913/update-sys_menu-voip.sql @@ -0,0 +1,6 @@ +UPDATE sys_menu set permission='avVoipIp:config',href='/ntc/av/voipList' where id=629; +UPDATE sys_menu set permission='avVoipAccount:config',href='/ntc/av/voipAccountList' where id=630; +UPDATE sys_menu set permission='avVoipIp:confirm',href='/ntc/av/voipList' where id=662; +UPDATE sys_menu set permission='avVoipAccount:confirm',href='/ntc/av/voipAccountList' where id=663; +UPDATE sys_menu set permission='avVoipIp:audit',href='/ntc/av/voipList' where id=832; +UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp index aaa65d552..33c7a52ba 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp @@ -410,7 +410,7 @@