Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
wangxin
2018-09-13 14:40:47 +08:00
4 changed files with 18 additions and 12 deletions

View File

@@ -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) {