switchIpInfo初始化提至common.js

去掉所有list界面的分类、标签、性质的末尾逗号
This commit is contained in:
duandongmei
2018-05-25 18:25:42 +08:00
parent bbd0aeeee8
commit cd1cb600b9
9 changed files with 83 additions and 49 deletions

View File

@@ -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<CfgIndexInfo> page = avContentCfgService.findPage(new Page<CfgIndexInfo>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
return "/cfg/av/voip/voipList";
}
}