diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java index dcbdbfb14..1d6c1a083 100644 --- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java @@ -37,7 +37,9 @@ public class PolicyGroupController extends BaseController { //@RequiresPermissions(value={"basics:policyGroup:view"},logical=Logical.OR) @RequestMapping(value = {"/policyGroupList", ""}) - public String policyGroupList(PolicyGroupInfo cfg,HttpServletRequest request, HttpServletResponse response, Model model) { + public String policyGroupList(PolicyGroupInfo cfg,HttpServletRequest request + , HttpServletResponse response, Model model + ,RedirectAttributes redirectAttributes) { if(cfg == null)cfg=new PolicyGroupInfo(); Page pageCondition = new Page(request, response,"r"); @@ -57,7 +59,7 @@ public class PolicyGroupController extends BaseController { */ //@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) @RequestMapping(value={"/policyGroupForm"}) - public String form(String ids,Model model,String doAction) { + public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) { PolicyGroupInfo policyGroup=new PolicyGroupInfo(); if(!StringUtil.isEmpty(ids)){ policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids)); @@ -71,22 +73,15 @@ public class PolicyGroupController extends BaseController { */ //@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) @RequestMapping(value = "saveOrUpdate") - public String saveOrUpdate(PolicyGroupInfo cfg,Model model, RedirectAttributes redirectAttributes,String itType) { + public String saveOrUpdate(PolicyGroupInfo cfg,Model model, + RedirectAttributes redirectAttributes,String itType) { try { policyGroupInfoService.saveOrUpdate(cfg); - if(!StringUtil.isEmpty(cfg.getGroupId())){ - addMessage(redirectAttributes, "save_success"); - }else{ - addMessage(redirectAttributes, "update_success"); - } + addMessage(redirectAttributes, "save_success"); } catch (Exception e) { - e.printStackTrace(); - if(!StringUtil.isEmpty(cfg.getGroupId())){ - addMessage(redirectAttributes, "save_failed"); - }else{ - addMessage(redirectAttributes, "update_failed"); - } + logger.error("新增失败",e); + addMessage(redirectAttributes, "save_failed"); } return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList"; @@ -106,7 +101,7 @@ public class PolicyGroupController extends BaseController { policyGroupInfoService.deldete(ids,isValid); addMessage(redirectAttributes, "delete_success"); } catch (Exception e) { - e.printStackTrace(); + logger.error("删除失败",e); addMessage(redirectAttributes, "delete_failed"); } return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList"; diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index 46fdd27b4..fb038e509 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -32,7 +32,9 @@ import com.nis.web.service.configuration.DnsIpCfgService; public class DnsIpCfgController extends BaseController { @RequestMapping(value = {"/list"}) - public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity){ + public String list(Model model,HttpServletRequest request + ,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity + ,RedirectAttributes redirectAttributes){ Page page = dnsIpCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -40,7 +42,9 @@ public class DnsIpCfgController extends BaseController { } @RequestMapping(value = {"/form"}) @RequiresPermissions(value={"dns:fake:ip:config"}) - public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg){ + public String form(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(ids)){ cfg = dnsIpCfgService.getDnsIpCfg(Long.parseLong(ids)); initUpdateFormCondition(model, cfg); @@ -56,15 +60,17 @@ public class DnsIpCfgController extends BaseController { @RequestMapping(value = {"/saveOrUpdate"}) @RequiresPermissions(value={"dns:fake:ip:config"}) - public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")DnsIpCfg cfg){ + public String saveOrUpdate(Model model,HttpServletRequest request + ,HttpServletResponse response, + @ModelAttribute("cfg")DnsIpCfg cfg + ,RedirectAttributes redirectAttributes){ try{ dnsIpCfgService.saveOrUpdate(cfg); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId(); @@ -72,13 +78,16 @@ public class DnsIpCfgController extends BaseController { @RequestMapping(value = {"/delete"}) @RequiresPermissions(value={"dns:fake:ip:config"}) - public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String delete(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ dnsIpCfgService.delete(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId; } @RequestMapping(value = {"/audit"}) //@RequiresPermissions(value={"dns:fake:ip:audit"}) - public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + public String audit(Integer isAudit,Integer isValid,String ids + ,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index 1194117f1..b2fbb5478 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -38,33 +38,29 @@ public class DnsResStrategyController extends BaseController { String ids, @ModelAttribute("cfg")DnsResStrategy cfg ,RedirectAttributes redirectAttributes){ - try { - if(cfg == null){ - cfg=new DnsResStrategy(); - } - if(!StringUtil.isEmpty(ids)){ - cfg = dnsResStrategyService.getDnsResStrategy(Long.valueOf(ids),-1); - initFormCondition(model, cfg); - model.addAttribute("isAdd", false); - }else{ - //不存在响应策略为0的配置，则新策略时，cfgId默认为0 - DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null); - if(dns0 == null){ - cfg.setCfgId(0l); - cfg.setCfgDesc("无策略"); - } - initFormCondition(model, cfg); - model.addAttribute("isAdd", true); - } - - //查询policyGroup列表，供响应策略选择 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); - model.addAttribute("policyGroups", policyGroups); - - model.addAttribute("_cfg", cfg); - } catch (Exception e) { - addMessage(redirectAttributes,e.getMessage()); + if(cfg == null){ + cfg=new DnsResStrategy(); } + if(!StringUtil.isEmpty(ids)){ + cfg = dnsResStrategyService.getDnsResStrategy(Long.valueOf(ids),-1); + initFormCondition(model, cfg); + model.addAttribute("isAdd", false); + }else{ + //不存在响应策略为0的配置，则新策略时，cfgId默认为0 + DnsResStrategy dns0=dnsResStrategyService.getDnsResStrategy(0l,null); + if(dns0 == null){ + cfg.setCfgId(0l); + cfg.setCfgDesc("无策略"); + } + initFormCondition(model, cfg); + model.addAttribute("isAdd", true); + } + + //查询policyGroup列表，供响应策略选择 + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); + model.addAttribute("policyGroups", policyGroups); + + model.addAttribute("_cfg", cfg); return "/cfg/maintenance/dnsResStrategy/form"; } @@ -90,15 +86,10 @@ public class DnsResStrategyController extends BaseController { public String list(Model model,HttpServletRequest request,HttpServletResponse response ,@ModelAttribute("cfg")DnsResStrategy entity ,RedirectAttributes redirectAttributes){ - try{ - //查询时left join policyGroup - Page page = dnsResStrategyService.findPage(new Page(request, response,"r"), entity); - model.addAttribute("page", page); - initPageCondition(model); - addMessage(redirectAttributes,"select_success"); - }catch(Exception e){ - addMessage(redirectAttributes,"select_failed"); - } + //查询时left join policyGroup + Page page = dnsResStrategyService.findPage(new Page(request, response,"r"), entity); + model.addAttribute("page", page); + initPageCondition(model); return "/cfg/maintenance/dnsResStrategy/list"; } @@ -108,13 +99,8 @@ public class DnsResStrategyController extends BaseController { ,Model model,HttpServletRequest request ,HttpServletResponse response ,RedirectAttributes redirectAttributes){ - try{ - if(!StringUtil.isEmpty(ids)){ - dnsResStrategyService.delete(isAudit,isValid,ids,functionId); - } - addMessage(redirectAttributes,"delete_success"); - }catch(Exception e){ - addMessage(redirectAttributes,"delete_failed"); + if(!StringUtil.isEmpty(ids)){ + dnsResStrategyService.delete(isAudit,isValid,ids,functionId); } return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId; @@ -131,8 +117,6 @@ public class DnsResStrategyController extends BaseController { try { dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("VOIP配置下发失败："+e.getMessage()); addMessage(redirectAttributes, e.getMessage()); } } 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 770f9f366..6d2f2e269 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,11 @@ public class AvContentController extends BaseController { //音视频VOIP配置新增界面 @RequestMapping(value = {"/voipForm"}) @RequiresPermissions(value={"avVoip:config"}) - public String voipFrom(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")CfgIndexInfo cfg){ + public String voipFrom(Model model,HttpServletRequest request + ,HttpServletResponse response + ,String ids,String compileIds + ,@ModelAttribute("cfg")CfgIndexInfo cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ cfg.setCompileId(Integer.parseInt(compileIds)); cfg = avContentCfgService.getCfgIndexInfo(cfg); @@ -80,22 +84,25 @@ public class AvContentController extends BaseController { @ModelAttribute("cfg")CfgIndexInfo cfg, @ModelAttribute("areaCfgIds")String areaCfgIds, @ModelAttribute("voipIpIds")String voipIpIds, - @ModelAttribute("voipAccountIds")String voipAccountIds){ + @ModelAttribute("voipAccountIds")String voipAccountIds + ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdateAvVoip(cfg,voipIpIds,voipAccountIds,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("voip信息保存失败",e); - e.printStackTrace(); - addMessage(model,"save_failed"); - } + addMessage(redirectAttributes,"save_failed"); + } return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId(); } //视频文本VOIP配置列表 @RequestMapping(value = {"/voipList"}) - public String voipCfgList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo entity){ + public String voipCfgList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")CfgIndexInfo entity + ,RedirectAttributes redirectAttributes){ if(entity.getVoipIp()== null){ entity.setVoipIp(new AvVoipIpCfg()); } @@ -112,14 +119,18 @@ public class AvContentController extends BaseController { //修改VOIP配置状态 @RequestMapping(value = {"/updateAvVoipValid"}) @RequiresPermissions(value={"avVoip:config"}) - public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId) { + public String updateVoipValid(Integer isAudit,Integer isValid,String ids,Integer functionId + ,RedirectAttributes redirectAttributes + ) { avContentCfgService.updateAvVoipValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId; } //修改VOIP配置审核状态 @RequestMapping(value = {"/auditAvVoip"}) @RequiresPermissions(value={"avVoip:audit"}) - public String auditVoip(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId,RedirectAttributes redirectAttributes) { + public String auditVoip(Integer isAudit,Integer isValid,String ids + ,String compileIds,Integer functionId + ,RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(compileIds)){ String[] idArray = compileIds.split(","); Date auditTime=new Date(); @@ -127,8 +138,7 @@ public class AvContentController extends BaseController { try { avContentCfgService.auditAvVoip(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("VOIP配置下发失败："+e.getMessage()); + logger.error("VOIP配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } @@ -159,7 +169,10 @@ public class AvContentController extends BaseController { /*****************************contIp业务***************/ //视频文本内容配置列表 @RequestMapping(value = {"/contIpList"}) - public String contIpList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseIpCfg entity){ + public String contIpList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")BaseIpCfg entity + ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findContIpPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -168,7 +181,10 @@ public class AvContentController extends BaseController { //音视频CONTIP新增界面 @RequestMapping(value = {"/contIpForm"}) @RequiresPermissions(value={"avContIp:config"}) - public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg){ + public String contIpForm(Model model,HttpServletRequest request,HttpServletResponse response + ,String ids,String compileIds + ,@ModelAttribute("cfg")BaseIpCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ cfg.setCompileId(Integer.parseInt(compileIds)); cfg = avContentCfgService.getContIpCfgById(cfg); @@ -182,7 +198,8 @@ public class AvContentController extends BaseController { //保存CONTIP信息 @RequestMapping(value = {"/saveContIp"}) - public String saveContIp(Model model,HttpServletRequest request,HttpServletResponse response, + public String saveContIp(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")BaseIpCfg cfg, @ModelAttribute("areaCfgIds")String areaCfgIds ,RedirectAttributes redirectAttributes){ @@ -201,14 +218,18 @@ public class AvContentController extends BaseController { //修改CONTIP例配置状态 @RequestMapping(value = {"/updateAvContIpValid"}) @RequiresPermissions(value={"avContIp:config"}) - public String updateAvContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvContIpValid(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ avContentCfgService.updateContIpValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/contIpList?functionId="+functionId; } //修改CONTIP配置审核 @RequestMapping(value = {"/auditAvContIp"}) @RequiresPermissions(value={"avContIp:audit"}) - public String auditContIp(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditContIp(Integer isAudit,Integer isValid + ,String ids,String compileIds,Integer functionId + , RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(compileIds)){ String[] idArray = compileIds.split(","); Date auditTime=new Date(); @@ -216,8 +237,7 @@ public class AvContentController extends BaseController { try { avContentCfgService.auditContIp(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("Cont Ip配置下发失败："+e.getMessage()); + logger.error("Cont Ip配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } @@ -231,7 +251,10 @@ public class AvContentController extends BaseController { /*****************************picIp业务***************/ //视频文本内容配置列表 @RequestMapping(value = {"/picIpList"}) - public String picIpList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseIpCfg entity){ + public String picIpList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")BaseIpCfg entity + ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findPicIpPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -240,7 +263,10 @@ public class AvContentController extends BaseController { //音视频CONTIP新增界面 @RequestMapping(value = {"/picIpForm"}) @RequiresPermissions(value={"avPicIp:config"}) - public String picIpForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg){ + public String picIpForm(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids + ,String compileIds,@ModelAttribute("cfg")BaseIpCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ cfg.setCompileId(Integer.parseInt(compileIds)); cfg = avContentCfgService.getPicIpCfgById(cfg); @@ -254,16 +280,18 @@ public class AvContentController extends BaseController { //保存CONTIP信息 @RequestMapping(value = {"/savePicIp"}) - public String savePicIp(Model model,HttpServletRequest request,HttpServletResponse response, + public String savePicIp(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")BaseIpCfg cfg, - @ModelAttribute("areaCfgIds")String areaCfgIds){ + @ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdatePicIp(cfg,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+cfg.getFunctionId(); @@ -272,14 +300,18 @@ public class AvContentController extends BaseController { //修改CONTIP例配置状态 @RequestMapping(value = {"/updatePicIpValid"}) @RequiresPermissions(value={"avPicIp:config"}) - public String updateAvPicIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvPicIpValid(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ avContentCfgService.updatePicIpValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/picIpList?functionId="+functionId; } //修改CONTIP配置审核 @RequestMapping(value = {"/auditPicIp"}) @RequiresPermissions(value={"avPicIp:audit"}) - public String auditPicIp(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditPicIp(Integer isAudit,Integer isValid,String ids + ,String compileIds,Integer functionId + , RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(compileIds)){ String[] idArray = compileIds.split(","); Date auditTime=new Date(); @@ -288,7 +320,7 @@ public class AvContentController extends BaseController { avContentCfgService.auditPicIp(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("Pic Ip配置下发失败："+e.getMessage()); + logger.error("Pic Ip配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } @@ -302,7 +334,10 @@ public class AvContentController extends BaseController { /*****************************contUrl业务***************/ //视频文本内容配置列表 @RequestMapping(value = {"/contUrlList"}) - public String contUrlList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){ + public String contUrlList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")BaseStringCfg entity + ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findContUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -311,7 +346,10 @@ public class AvContentController extends BaseController { //音视频CONTUrl新增界面 @RequestMapping(value = {"/contUrlForm"}) @RequiresPermissions(value={"avContUrl:config"}) - public String contUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseStringCfg cfg){ + public String contUrlForm(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids,String compileIds + ,@ModelAttribute("cfg")BaseStringCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ cfg.setCompileId(Integer.parseInt(compileIds)); cfg = avContentCfgService.getContUrlCfgById(cfg); @@ -325,16 +363,17 @@ public class AvContentController extends BaseController { //保存CONTUrl信息 @RequestMapping(value = {"/saveContUrl"}) - public String saveContUrl(Model model,HttpServletRequest request,HttpServletResponse response, + public String saveContUrl(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")BaseStringCfg cfg, - @ModelAttribute("areaCfgIds")String areaCfgIds){ + @ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdateContUrl(cfg,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+cfg.getFunctionId(); @@ -343,14 +382,18 @@ public class AvContentController extends BaseController { //修改CONTUrl例配置状态 @RequestMapping(value = {"/updateAvContUrlValid"}) @RequiresPermissions(value={"avContUrl:config"}) - public String updateAvContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvContUrlValid(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ avContentCfgService.updateContUrlValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/contUrlList?functionId="+functionId; } //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvContUrl"}) @RequiresPermissions(value={"avContUrl:audit"}) - public String auditContUrl(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditContUrl(Integer isAudit,Integer isValid,String ids + ,String compileIds,Integer functionId + , RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(compileIds)){ String[] idArray = compileIds.split(","); Date auditTime=new Date(); @@ -359,7 +402,7 @@ public class AvContentController extends BaseController { avContentCfgService.auditContUrl(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("Cont Url配置下发失败："+e.getMessage()); + logger.info("Cont Url配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } @@ -373,7 +416,10 @@ public class AvContentController extends BaseController { /*****************************picUrl业务***************/ //视频文本内容配置列表 @RequestMapping(value = {"/picUrlList"}) - public String picUrlList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")BaseStringCfg entity){ + public String picUrlList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")BaseStringCfg entity + ,RedirectAttributes redirectAttributes){ Page page = avContentCfgService.findPicUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -382,7 +428,10 @@ public class AvContentController extends BaseController { //音视频CONTUrl新增界面 @RequestMapping(value = {"/picUrlForm"}) @RequiresPermissions(value={"avPicUrl:config"}) - public String picUrlForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,String compileIds,@ModelAttribute("cfg")BaseStringCfg cfg){ + public String picUrlForm(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids + ,String compileIds,@ModelAttribute("cfg")BaseStringCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(compileIds)){ cfg.setCompileId(Integer.parseInt(compileIds)); cfg = avContentCfgService.getPicUrlCfgById(cfg); @@ -396,16 +445,17 @@ public class AvContentController extends BaseController { //保存CONTUrl信息 @RequestMapping(value = {"/savePicUrl"}) - public String savePicUrl(Model model,HttpServletRequest request,HttpServletResponse response, + public String savePicUrl(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")BaseStringCfg cfg, - @ModelAttribute("areaCfgIds")String areaCfgIds){ + @ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes){ try{ avContentCfgService.saveOrUpdatePicUrl(cfg,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+cfg.getFunctionId(); @@ -414,14 +464,18 @@ public class AvContentController extends BaseController { //修改CONTUrl例配置状态 @RequestMapping(value = {"/updateAvPicUrlValid"}) @RequiresPermissions(value={"avPicUrl:config"}) - public String updateAvPicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String updateAvPicUrlValid(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ avContentCfgService.updatePicUrlValid(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/av/picUrlList?functionId="+functionId; } //修改CONTUrl配置审核 @RequestMapping(value = {"/auditAvPicUrl"}) @RequiresPermissions(value={"avPicUrl:audit"}) - public String auditPicUrl(Integer isAudit,Integer isValid,String ids,String compileIds,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditPicUrl(Integer isAudit,Integer isValid + ,String ids,String compileIds,Integer functionId + , RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(compileIds)){ String[] idArray = compileIds.split(","); Date auditTime=new Date(); @@ -430,7 +484,7 @@ public class AvContentController extends BaseController { avContentCfgService.auditPicUrl(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("Pic Url配置下发失败："+e.getMessage()); + logger.info("Pic Url配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 2cbac0789..91766cba6 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -36,7 +36,9 @@ public class BgpCfgController extends BaseController{ @RequestMapping(value = {"bgpList"}) @RequiresPermissions(value={"other:bgp:config"}) - public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) { + public String httpList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg + ,HttpServletRequest request,HttpServletResponse response + ,RedirectAttributes redirectAttributes) { Page searchPage=new Page(request,response,"a"); Page page = bgpCfgService.getBgpList(searchPage, cfg); model.addAttribute("page", page); @@ -49,7 +51,7 @@ public class BgpCfgController extends BaseController{ @RequestMapping(value = {"bgpForm"}) @RequiresPermissions(value={"other:bgp:config"}) - public String bgpForm(Model model,String ids,CfgIndexInfo entity) { + public String bgpForm(Model model,String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) { if(StringUtils.isNotBlank(ids)){ entity = bgpCfgService.getBgpCfg(Long.parseLong(ids)); initUpdateFormCondition(model,entity); @@ -62,7 +64,9 @@ public class BgpCfgController extends BaseController{ @RequestMapping(value = {"saveBgpCfg"}) @RequiresPermissions(value={"other:bgp:config"}) - public String saveBgpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) { + public String saveBgpCfg(Model model,HttpServletRequest request,HttpServletResponse response + ,String ids,CfgIndexInfo entity + ,RedirectAttributes redirectAttributes) { bgpCfgService.saveBgpCfg(entity); return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+entity.getFunctionId(); } @@ -98,14 +102,15 @@ public class BgpCfgController extends BaseController{ @RequestMapping(value = {"updateBgpCfgValid"}) @RequiresPermissions(value={"other:bgp:config"}) - public String updateBgpCfgValid(Integer isValid,String ids,Integer functionId) { + public String updateBgpCfgValid(Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) { bgpCfgService.updateBgpCfgValid(isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/other/bgpList?functionId="+functionId; } @RequestMapping(value = {"auditBgpCfg"}) @RequiresPermissions(value={"other:bgp:audit"}) - public String auditBgpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditBgpCfg(Integer isAudit,Integer isValid,String ids + ,Integer functionId, RedirectAttributes redirectAttributes) { CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ @@ -119,7 +124,7 @@ public class BgpCfgController extends BaseController{ bgpCfgService.auditBgpCfg(entity,isAudit); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("bgp配置下发失败："+e.getMessage()); + logger.error("bgp配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 8a691af48..2f47668f0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -132,7 +132,9 @@ public class FileTransferCfgController extends BaseController{ @RequestMapping(value = {"fileDigestList"}) @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) - public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg,HttpServletRequest request,HttpServletResponse response) { + public String fileDigestList(Model model,@ModelAttribute("cfg")FileDigestCfg cfg + ,HttpServletRequest request,HttpServletResponse response + ,RedirectAttributes redirectAttributes) { Page searchPage=new Page(request,response,"a"); Page page = fileTransferCfgService.getFileDigestList(searchPage, cfg); model.addAttribute("page", page); @@ -142,7 +144,7 @@ public class FileTransferCfgController extends BaseController{ @RequestMapping(value = {"fileDigestForm"}) @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) - public String fileDigestForm(Model model,String ids,FileDigestCfg entity) { + public String fileDigestForm(Model model,String ids,FileDigestCfg entity,RedirectAttributes redirectAttributes) { if(StringUtils.isNotBlank(ids)){ entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids)); initUpdateFormCondition(model,entity); @@ -154,8 +156,11 @@ public class FileTransferCfgController extends BaseController{ } @RequestMapping(value = {"saveFileDigestCfg"}) @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) - public String saveFileDigestCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids, - FileDigestCfg entity,MultipartFile file,@ModelAttribute("areaCfgIds")String areaCfgIds) { + public String saveFileDigestCfg(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids, + FileDigestCfg entity,MultipartFile file + ,@ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes) { try { Date fileTime=null; Date date=new Date(); @@ -196,14 +201,16 @@ public class FileTransferCfgController extends BaseController{ } @RequestMapping(value = {"updateFileDigestValid"}) @RequiresPermissions(value={"fileTransfer:fileDigest:config"}) - public String updateFileDigestValid(Integer isValid,String ids,Integer functionId) { + public String updateFileDigestValid(Integer isValid,String ids,Integer functionId + ,RedirectAttributes redirectAttributes) { fileTransferCfgService.updateFileDigestCfgValid(isValid,ids,functionId); return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId; } @RequestMapping(value = {"auditFileDigestCfg"}) @RequiresPermissions(value={"fileTransfer:fileDigest:audit"}) - public String auditFileDigestCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + public String auditFileDigestCfg(Integer isAudit,Integer isValid + ,String ids,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); @@ -211,8 +218,7 @@ public class FileTransferCfgController extends BaseController{ try { fileTransferCfgService.auditFileDigestCfg(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("File Digest配置下发失败："+e.getMessage()); + logger.error("File Digest配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java index a7c4358fa..801d6eb51 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java @@ -36,7 +36,10 @@ import com.nis.web.controller.BaseController; @RequestMapping("${adminPath}/proxy/control") public class ControlPolicyController extends BaseController{ @RequestMapping(value = {"httpReqReplace/list"}) - public String reqList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){ + public String reqList(Model model,HttpServletRequest request + ,HttpServletResponse response + ,@ModelAttribute("cfg")HttpBodyCfg entity + ,RedirectAttributes redirectAttributes){ Page page = controlPolicyService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -44,7 +47,10 @@ public class ControlPolicyController extends BaseController{ } @RequestMapping(value = {"httpReqReplace/form"}) @RequiresPermissions(value={"proxy:contol:httpReqReplace:config"}) - public String reqForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){ + public String reqForm(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids + ,@ModelAttribute("cfg")HttpBodyCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(ids)){ cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids)); initUpdateFormCondition(model, cfg); @@ -56,16 +62,17 @@ public class ControlPolicyController extends BaseController{ } @RequestMapping(value = {"httpReqReplace/saveOrUpdate"}) - public String reqSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, + public String reqSaveOrUpdate(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")HttpBodyCfg cfg, - @ModelAttribute("areaCfgIds")String areaCfgIds){ + @ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes){ try{ controlPolicyService.saveOrUpdate(cfg,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId(); @@ -73,12 +80,15 @@ public class ControlPolicyController extends BaseController{ @RequestMapping(value = {"httpReqReplace/delete"}) @RequiresPermissions(value={"proxy:contol:httpReqReplace:config"}) - public String reqDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String reqDelete(Integer isAudit,Integer isValid,String ids + ,Integer functionId + ,RedirectAttributes redirectAttributes){ controlPolicyService.update(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId; } @RequestMapping(value = {"httpReqReplace/audit"}) - public String reqAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + public String reqAudit(Integer isAudit,Integer isValid,String ids + ,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); @@ -86,8 +96,7 @@ public class ControlPolicyController extends BaseController{ try { controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("配置下发失败："+e.getMessage()); + logger.error("配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } } @@ -96,7 +105,9 @@ public class ControlPolicyController extends BaseController{ return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+functionId; } @RequestMapping(value = {"httpResReplace/list"}) - public String reslist(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity){ + public String reslist(Model model,HttpServletRequest request + ,HttpServletResponse response,@ModelAttribute("cfg")HttpBodyCfg entity + ,RedirectAttributes redirectAttributes){ Page page = controlPolicyService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); @@ -104,7 +115,10 @@ public class ControlPolicyController extends BaseController{ } @RequestMapping(value = {"httpResReplace/form"}) @RequiresPermissions(value={"proxy:contol:httpResReplace:config"}) - public String resForm(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")HttpBodyCfg cfg){ + public String resForm(Model model,HttpServletRequest request + ,HttpServletResponse response,String ids + ,@ModelAttribute("cfg")HttpBodyCfg cfg + ,RedirectAttributes redirectAttributes){ if(!StringUtil.isEmpty(ids)){ cfg = controlPolicyService.getHttpBodyCfgById(Long.valueOf(ids)); initUpdateFormCondition(model, cfg); @@ -116,16 +130,17 @@ public class ControlPolicyController extends BaseController{ } @RequestMapping(value = {"httpResReplace/saveOrUpdate"}) - public String resSaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, + public String resSaveOrUpdate(Model model,HttpServletRequest request + ,HttpServletResponse response, @ModelAttribute("cfg")HttpBodyCfg cfg, - @ModelAttribute("areaCfgIds")String areaCfgIds){ + @ModelAttribute("areaCfgIds")String areaCfgIds + ,RedirectAttributes redirectAttributes){ try{ controlPolicyService.saveOrUpdate(cfg,areaCfgIds); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ logger.error("信息保存失败",e); - e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+cfg.getFunctionId(); @@ -133,12 +148,15 @@ public class ControlPolicyController extends BaseController{ @RequestMapping(value = {"httpResReplace/delete"}) @RequiresPermissions(value={"proxy:contol:httpResReplace:config"}) - public String resDelete(Integer isAudit,Integer isValid,String ids,Integer functionId){ + public String resDelete(Integer isAudit,Integer isValid + ,String ids,Integer functionId + ,RedirectAttributes redirectAttributes){ controlPolicyService.update(isAudit,isValid,ids,functionId); return "redirect:" + adminPath +"/proxy/control/httpResReplace/list?functionId="+functionId; } @RequestMapping(value = {"httpResReplace/audit"}) - public String resAudit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) { + public String resAudit(Integer isAudit,Integer isValid,String ids + ,Integer functionId, RedirectAttributes redirectAttributes) { if(!StringUtil.isEmpty(ids)){ String[] idArray = ids.split(","); Date auditTime=new Date(); @@ -147,7 +165,7 @@ public class ControlPolicyController extends BaseController{ controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("配置下发失败："+e.getMessage()); + logger.error("配置下发失败",e); addMessage(redirectAttributes, e.getMessage()); } }