From 01eebad6c1f0ecea9883337d4c9141ccfe064c53 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Mon, 2 Jul 2018 09:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AEcontroller?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E9=87=8D=E5=AE=9A=E5=90=91=E5=90=8E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BC=A0=E8=87=B3=E5=89=8D=E5=8F=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=BF=E7=94=A8model=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=94=B9=E4=B8=BAredirectAttributes=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IpMultiplexPoolCfgController.java | 17 +++++++++-------- .../manipulation/DdosCfgController.java | 6 +++--- .../configuration/ntc/AvController.java | 6 +++--- .../proxy/HttpRedirectPolicyController.java | 6 +++--- .../cfg/maintenance/ipMultiplexPool/list.jsp | 10 +--------- 5 files changed, 19 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java index f395ca250..a0bc4e9da 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java @@ -46,7 +46,7 @@ public class IpMultiplexPoolCfgController extends BaseController { initFormCondition(model, cfg); } - //查询policyGroup列表，供响应策略选择 + //查询ip复用地址池配置的policyGroup列表 List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2); model.addAttribute("policyGroups", policyGroups); @@ -56,16 +56,16 @@ public class IpMultiplexPoolCfgController extends BaseController { @RequestMapping(value = {"/saveOrUpdate"}) @RequiresPermissions(value={"ip:mulitiplex:pool:config"}) - public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, + public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes, @ModelAttribute("cfg")IpMultiplexPoolCfg cfg){ try{ ipMultiplexPoolCfgService.saveOrUpdate(cfg); - addMessage(model,"save_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ e.printStackTrace(); - addMessage(model,"save_failed"); + addMessage(redirectAttributes,"save_failed"); } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+cfg.getFunctionId(); @@ -82,14 +82,15 @@ public class IpMultiplexPoolCfgController extends BaseController { @RequestMapping(value = {"/delete"}) @RequiresPermissions(value={"ip:mulitiplex:pool:config"}) - public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,HttpServletRequest request,HttpServletResponse response){ + public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,RedirectAttributes redirectAttributes + ,HttpServletRequest request,HttpServletResponse response){ try{ if(!StringUtil.isEmpty(ids)){ ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId); } - addMessage(model,"delete_success"); + addMessage(redirectAttributes,"delete_success"); }catch(Exception e){ - addMessage(model,"delete_failed"); + addMessage(redirectAttributes,"delete_failed"); } return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId; @@ -106,7 +107,7 @@ public class IpMultiplexPoolCfgController extends BaseController { ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime); } catch (MaatConvertException e) { e.printStackTrace(); - logger.info("VOIP配置下发失败："+e.getMessage()); + logger.info("IP复用地址池配置下发失败："+e.getMessage()); addMessage(redirectAttributes, e.getMessage()); } } diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java index 350f66d16..b8dfa57e5 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java @@ -53,14 +53,14 @@ public class DdosCfgController extends BaseController { @RequestMapping(value = {"/saveOrUpdate"}) @RequiresPermissions(value={"ddos:ip:config"}) public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")DdosIpCfg cfg){ + @ModelAttribute("cfg")DdosIpCfg cfg, RedirectAttributes redirectAttributes){ try{ ddosCfgService.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 +"/manipulation/ddos/list?functionId="+cfg.getFunctionId(); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 7fc19fd92..aabbf4c25 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -92,7 +92,7 @@ public class AvController extends BaseController { } //保存文件样例配置 @RequestMapping(value = {"/sample/saveFileSample"}) - public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, + public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes, String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){ try{ if(srcFile!=null && sampleFile!=null && @@ -129,14 +129,14 @@ public class AvController extends BaseController { }catch(Exception e){ logger.error("文件上传失败",e); e.printStackTrace(); - addMessage(model,"file_upload_failed"); + addMessage(redirectAttributes,e.getMessage()); } return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId(); } //保存标志样例配置 @RequestMapping(value = {"/sample/saveSignSample"}) - public String saveSignSample(Model model,HttpServletRequest request,HttpServletResponse response,String ids,AvSignSampleCfg entity){ + public String saveSignSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,String ids,AvSignSampleCfg entity){ avCfgService.saveOrUpdateAvSignSample(entity); return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+entity.getFunctionId(); } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java index 91b83f087..5f183849d 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java @@ -137,14 +137,14 @@ public class HttpRedirectPolicyController extends BaseController{ @RequestMapping(value = {"saveOrUpdate"}) @RequiresPermissions(value={"control:httpRedirect:config"}) public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")CfgIndexInfo cfg){ + @ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){ try{ httpRedirectCfgService.saveHttpCfg(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 +"/proxy/control/httpRedirect/list?functionId="+cfg.getFunctionId(); diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 251a48fa4..926e54943 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -269,7 +269,6 @@ - @@ -337,14 +336,7 @@ - - - - - - - - + ${cfg.requestName }