diff --git a/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java b/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java index f03db350c..a84ad6f29 100644 --- a/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java +++ b/src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java @@ -199,4 +199,15 @@ public class NtcDnsResStrategy { public void setCfgId(Integer cfgId) { this.cfgId = cfgId; } + public void init() { + resGroup2Id=0; + resGroup2Num=0; + resGroup3Id=0; + resGroup3Num=0; + resGroup4Id=0; + resGroup4Num=0; + resGroup5Id=0; + resGroup5Num=0; + + } } 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 886cf947f..e52c7b13a 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 @@ -36,69 +36,85 @@ public class DnsResStrategyController extends BaseController { HttpServletRequest request, HttpServletResponse response, String ids, - @ModelAttribute("cfg")DnsResStrategy cfg){ - 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("无策略"); + @ModelAttribute("cfg")DnsResStrategy cfg + ,RedirectAttributes redirectAttributes){ + try { + if(cfg == null){ + cfg=new DnsResStrategy(); } - initFormCondition(model, cfg); - model.addAttribute("isAdd", true); + 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()); } - - //查询policyGroup列表，供响应策略选择 - List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1); - model.addAttribute("policyGroups", policyGroups); - - model.addAttribute("_cfg", cfg); return "/cfg/maintenance/dnsResStrategy/form"; } @RequestMapping(value = {"/saveOrUpdate"}) @RequiresPermissions(value={"dns:res:strategy:config"}) public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, - @ModelAttribute("cfg")DnsResStrategy cfg){ + @ModelAttribute("cfg")DnsResStrategy cfg + ,RedirectAttributes redirectAttributes){ try{ dnsResStrategyService.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/dnsResStrategy/list?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"/list"}) - public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsResStrategy entity){ - //查询时left join policyGroup - Page page = dnsResStrategyService.findPage(new Page(request, response,"r"), entity); - model.addAttribute("page", page); - initPageCondition(model); + 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"); + } return "/cfg/maintenance/dnsResStrategy/list"; } @RequestMapping(value = {"/delete"}) @RequiresPermissions(value={"dns:res:strategy: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,HttpServletRequest request + ,HttpServletResponse response + ,RedirectAttributes redirectAttributes){ try{ if(!StringUtil.isEmpty(ids)){ dnsResStrategyService.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/dnsResStrategy/list?functionId="+functionId; @@ -106,7 +122,8 @@ public class DnsResStrategyController extends BaseController { @RequestMapping(value = {"/audit"}) //@RequiresPermissions(value={"dns:res:strategy: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/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 0e0d26a72..51b2a0bd7 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -503,24 +503,17 @@ public abstract class BaseService { //ip转换为callback用ip public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){ NtcDnsResStrategy resStrategy=new NtcDnsResStrategy(); + resStrategy.init(); resStrategy.setId(Long.valueOf(cfg.getCompileId())); resStrategy.setCfgId(cfg.getCompileId()); resStrategy.setReqStrateId(cfg.getCfgId()); resStrategy.setStrateName(cfg.getCfgDesc()); resStrategy.setAction(cfg.getAction()); resStrategy.setService(cfg.getServiceId()); - resStrategy.setResGroup1Id(cfg.getServiceId()); - resStrategy.setResGroup1Num(cfg.getServiceId()); - resStrategy.setResGroup2Id(cfg.getServiceId()); - resStrategy.setResGroup2Num(cfg.getServiceId()); - resStrategy.setResGroup3Id(cfg.getServiceId()); - resStrategy.setResGroup3Num(cfg.getServiceId()); - resStrategy.setResGroup4Id(cfg.getServiceId()); - resStrategy.setResGroup4Num(cfg.getServiceId()); - resStrategy.setResGroup5Id(cfg.getServiceId()); - resStrategy.setResGroup5Num(cfg.getServiceId()); - resStrategy.setMinTtl(cfg.getServiceId()); - resStrategy.setMaxTtl(cfg.getServiceId()); + resStrategy.setResGroup1Id(cfg.getResGroup1Id()); + resStrategy.setResGroup1Num(cfg.getResGroup1Num()); + resStrategy.setMinTtl(cfg.getMinTtl()); + resStrategy.setMaxTtl(cfg.getMaxTtl()); resStrategy.setIsValid(cfg.getIsValid()); resStrategy.setOpTime(cfg.getAuditTime()); return resStrategy; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index d0150d97f..01909dbe6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -700,4 +700,6 @@ policy_number=policy number policy_name=policy name min_ttl=min ttl max_ttl=max ttl +ttl_unit=unit/s +res_group_num=response number #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ac0010f6b..f519dff66 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -684,4 +684,6 @@ policy_number=policy number policy_name=policy name min_ttl=min ttl max_ttl=max ttl +ttl_unit=unit/s +res_group_num=response number #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 18fadadf8..3800364bd 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -737,4 +737,6 @@ policy_number=\u7B56\u7565\u53F7 policy_name=\u7B56\u7565\u540D\u79F0 min_ttl=\u6700\u5C0F\u5B58\u6D3B\u65F6\u95F4 max_ttl=\u6700\u5927\u5B58\u6D3B\u65F6\u95F4 +ttl_unit=\u5355\u4F4D/\u79D2 +res_group_num=\u5E94\u7B54\u6570 #=============about Maintenance========= \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp index 6fc678d8e..50d86e17f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp @@ -138,7 +138,7 @@ $(function(){
- " type="text" name="minTtl" value="${_cfg.minTtl}"> + " type="text" name="minTtl" value="${_cfg.minTtl}">
@@ -147,7 +147,7 @@ $(function(){
- " type="text" name="maxTtl" value="${_cfg.maxTtl}"> + " type="text" name="maxTtl" value="${_cfg.maxTtl}">
@@ -167,6 +167,15 @@ $(function(){ +
+
+ +
+ +
+
+
+
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 5662afef5..63bb7c05c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -258,6 +258,7 @@ + @@ -294,6 +295,7 @@ ${fns:abbr(cfg.group1Name,20)} + ${cfg.resGroup1Num } ${cfg.minTtl } ${cfg.maxTtl }