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 6e3221bcc..256734a19 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 @@ -30,7 +30,6 @@ import com.nis.web.controller.BaseController; @RequestMapping("${adminPath}/ntc/av") public class AvContentController extends BaseController { - //音视频VOIP配置新增界面 @RequestMapping(value = {"/voipForm"}) public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo cfg){ @@ -117,4 +116,19 @@ public class AvContentController extends BaseController { return voipAndAccountInfoMap; } + //视频文本内容配置列表 + @RequestMapping(value = {"/contIpList"}) + public String contIpList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo entity){ + if(entity.getVoipIp()== null){ + entity.setVoipIp(new AvVoipIpCfg()); + } + if(entity.getVoipAccount()== null){ + entity.setVoipAccount(new AvVoipAccountCfg()); + } + Page page = avContentCfgService.findPage(new Page(request, response,"r"), entity); + model.addAttribute("page", page); + initPageCondition(model); + return "/cfg/av/voip/voipList"; + } + } diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp index 7e8151c68..de8913569 100644 --- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp @@ -370,26 +370,32 @@ - + - ${fl.itemValue}, + ${fl.itemValue} + , - ${classifyName[status]} - + - ${xz.itemValue}, + + ${xz.itemValue} + , + - + - ${lable.itemValue}, + + ${lable.itemValue} + , + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index 21a8a7f1b..89b812c9d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -4,8 +4,6 @@ <spring:message code="${cfgName}"></spring:message> - -