gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改区域地域ip和地域运营商不互斥的bug

Browse Source 
去掉cfgIndexInfo中areaIpCfg对象
cont_ip修改功能完成
This commit is contained in:
duandongmei
2018-05-30 17:10:39 +08:00
parent 911b9a6e09
commit d0d9c3eece
9 changed files with 221 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -141,9 +141,12 @@ public class AvContentController extends BaseController {
@RequestMapping(value = {"/contentIpForm"})
public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")AvContIpCfg cfg){
if(!StringUtil.isEmpty(ids)){
cfg.setCfgId(Long.parseLong(ids));
cfg = avContentCfgService.getContIpCfgById(cfg);
initUpdateFormCondition(model, cfg);
}else{
initFormCondition(model,cfg);
}
initFormCondition(model,cfg);
model.addAttribute("_cfg", cfg);
return "/cfg/av/contIp/contIpForm";
}
@@ -151,9 +154,10 @@ public class AvContentController extends BaseController {
//保存voip信息
@RequestMapping(value = {"/saveContIp"})
public String saveContIp(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")AvContIpCfg cfg){
@ModelAttribute("cfg")AvContIpCfg cfg,
@ModelAttribute("areaCfgIds")String areaCfgIds){
try{
avContentCfgService.saveOrUpdateAvContIp(cfg);
avContentCfgService.saveOrUpdateAvContIp(cfg,areaCfgIds);
addMessage(model,"save_success");
}catch(Exception e){
logger.error("信息保存失败",e);