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

修改dns响应策略下发部分信息填写错误bug

Browse Source 
dns响应策略增加界面增加响应数属性
This commit is contained in:
duandongmei
2018-07-02 10:12:14 +08:00
parent 01eebad6c1
commit a801efdef4
8 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/nis/domain/callback/NtcDnsResStrategy.java
View File

@@ -199,4 +199,15 @@ public class NtcDnsResStrategy {
public void setCfgId(Integer cfgId) { public void setCfgId(Integer cfgId) {
this.cfgId = cfgId; this.cfgId = cfgId;
} }
public void init() {
resGroup2Id=0;
resGroup2Num=0;
resGroup3Id=0;
resGroup3Num=0;
resGroup4Id=0;
resGroup4Num=0;
resGroup5Id=0;
resGroup5Num=0;
}
} }

85
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -36,69 +36,85 @@ public class DnsResStrategyController extends BaseController {
HttpServletRequest request, HttpServletRequest request,
HttpServletResponse response, HttpServletResponse response,
String ids, String ids,
@ModelAttribute("cfg")DnsResStrategy cfg){ @ModelAttribute("cfg")DnsResStrategy cfg
if(cfg == null){ ,RedirectAttributes redirectAttributes){
cfg=new DnsResStrategy(); try {
} if(cfg == null){
if(!StringUtil.isEmpty(ids)){ cfg=new DnsResStrategy();
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); if(!StringUtil.isEmpty(ids)){
model.addAttribute("isAdd", true); 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<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", cfg);
} catch (Exception e) {
addMessage(redirectAttributes,e.getMessage());
} }
//查询policyGroup列表，供响应策略选择
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", cfg);
return "/cfg/maintenance/dnsResStrategy/form"; return "/cfg/maintenance/dnsResStrategy/form";
} }
@RequestMapping(value = {"/saveOrUpdate"}) @RequestMapping(value = {"/saveOrUpdate"})
@RequiresPermissions(value={"dns:res:strategy:config"}) @RequiresPermissions(value={"dns:res:strategy:config"})
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response, public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")DnsResStrategy cfg){ @ModelAttribute("cfg")DnsResStrategy cfg
,RedirectAttributes redirectAttributes){
try{ try{
dnsResStrategyService.saveOrUpdate(cfg); dnsResStrategyService.saveOrUpdate(cfg);
addMessage(model,"save_success"); addMessage(redirectAttributes,"save_success");
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
addMessage(model,"save_failed"); addMessage(redirectAttributes,"save_failed");
} }
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+cfg.getFunctionId(); return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+cfg.getFunctionId();
} }
@RequestMapping(value = {"/list"}) @RequestMapping(value = {"/list"})
public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsResStrategy entity){ public String list(Model model,HttpServletRequest request,HttpServletResponse response
//查询时left join policyGroup ,@ModelAttribute("cfg")DnsResStrategy entity
Page<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(request, response,"r"), entity); ,RedirectAttributes redirectAttributes){
model.addAttribute("page", page); try{
initPageCondition(model); //查询时left join policyGroup
Page<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(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"; return "/cfg/maintenance/dnsResStrategy/list";
} }
@RequestMapping(value = {"/delete"}) @RequestMapping(value = {"/delete"})
@RequiresPermissions(value={"dns:res:strategy:config"}) @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{ try{
if(!StringUtil.isEmpty(ids)){ if(!StringUtil.isEmpty(ids)){
dnsResStrategyService.delete(isAudit,isValid,ids,functionId); dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
} }
addMessage(model,"delete_success"); addMessage(redirectAttributes,"delete_success");
}catch(Exception e){ }catch(Exception e){
addMessage(model,"delete_failed"); addMessage(redirectAttributes,"delete_failed");
} }
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId; return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
@@ -106,7 +122,8 @@ public class DnsResStrategyController extends BaseController {
@RequestMapping(value = {"/audit"}) @RequestMapping(value = {"/audit"})
//@RequiresPermissions(value={"dns:res:strategy: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)){ if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(","); String[] idArray = ids.split(",");
Date auditTime=new Date(); Date auditTime=new Date();

17
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -503,24 +503,17 @@ public abstract class BaseService {
//ip转换为callback用ip //ip转换为callback用ip
public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){ public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
NtcDnsResStrategy resStrategy=new NtcDnsResStrategy(); NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();
resStrategy.init();
resStrategy.setId(Long.valueOf(cfg.getCompileId())); resStrategy.setId(Long.valueOf(cfg.getCompileId()));
resStrategy.setCfgId(cfg.getCompileId()); resStrategy.setCfgId(cfg.getCompileId());
resStrategy.setReqStrateId(cfg.getCfgId()); resStrategy.setReqStrateId(cfg.getCfgId());
resStrategy.setStrateName(cfg.getCfgDesc()); resStrategy.setStrateName(cfg.getCfgDesc());
resStrategy.setAction(cfg.getAction()); resStrategy.setAction(cfg.getAction());
resStrategy.setService(cfg.getServiceId()); resStrategy.setService(cfg.getServiceId());
resStrategy.setResGroup1Id(cfg.getServiceId()); resStrategy.setResGroup1Id(cfg.getResGroup1Id());
resStrategy.setResGroup1Num(cfg.getServiceId()); resStrategy.setResGroup1Num(cfg.getResGroup1Num());
resStrategy.setResGroup2Id(cfg.getServiceId()); resStrategy.setMinTtl(cfg.getMinTtl());
resStrategy.setResGroup2Num(cfg.getServiceId()); resStrategy.setMaxTtl(cfg.getMaxTtl());
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.setIsValid(cfg.getIsValid()); resStrategy.setIsValid(cfg.getIsValid());
resStrategy.setOpTime(cfg.getAuditTime()); resStrategy.setOpTime(cfg.getAuditTime());
return resStrategy; return resStrategy;

2
src/main/resources/messages/message_en.properties
View File

@@ -700,4 +700,6 @@ policy_number=policy number
policy_name=policy name policy_name=policy name
min_ttl=min ttl min_ttl=min ttl
max_ttl=max ttl max_ttl=max ttl
ttl_unit=unit/s
res_group_num=response number
#=============about Maintenance========= #=============about Maintenance=========

2
src/main/resources/messages/message_ru.properties
View File

@@ -684,4 +684,6 @@ policy_number=policy number
policy_name=policy name policy_name=policy name
min_ttl=min ttl min_ttl=min ttl
max_ttl=max ttl max_ttl=max ttl
ttl_unit=unit/s
res_group_num=response number
#=============about Maintenance========= #=============about Maintenance=========

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -737,4 +737,6 @@ policy_number=\u7B56\u7565\u53F7
policy_name=\u7B56\u7565\u540D\u79F0 policy_name=\u7B56\u7565\u540D\u79F0
min_ttl=\u6700\u5C0F\u5B58\u6D3B\u65F6\u95F4 min_ttl=\u6700\u5C0F\u5B58\u6D3B\u65F6\u95F4
max_ttl=\u6700\u5927\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========= #=============about Maintenance=========

13
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
View File

@@ -138,7 +138,7 @@ $(function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="min_ttl"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="min_ttl"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required number" placeholder="<spring:message code="ttlUnit" />" type="text" name="minTtl" value="${_cfg.minTtl}"> <input class="form-control required number" placeholder="<spring:message code="ttl_unit" />" type="text" name="minTtl" value="${_cfg.minTtl}">
</div> </div>
<div for="minTtl"></div> <div for="minTtl"></div>
</div> </div>
@@ -147,7 +147,7 @@ $(function(){
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="max_ttl"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="max_ttl"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required number" placeholder="<spring:message code="ttlUnit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}"> <input class="form-control required number" placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}">
</div> </div>
<div for="maxTtl"></div> <div for="maxTtl"></div>
</div> </div>
@@ -167,6 +167,15 @@ $(function(){
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="res_group_num"/></label>
<div class="col-md-6">
<input class="form-control number" type="text" name="resGroup1Num" value="${_cfg.resGroup1Num}">
</div>
<div for="resGroup1Num"></div>
</div>
</div>
</div> </div>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div> </div>

2
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
View File

@@ -258,6 +258,7 @@
<th><spring:message code="policy_number"/></th> <th><spring:message code="policy_number"/></th>
<th><spring:message code="policy_name"/></th> <th><spring:message code="policy_name"/></th>
<th><spring:message code="group_name"/></th> <th><spring:message code="group_name"/></th>
<th><spring:message code="res_group_num"/></th>
<th><spring:message code="min_ttl"/></th> <th><spring:message code="min_ttl"/></th>
<th><spring:message code="max_ttl"/></th> <th><spring:message code="max_ttl"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
@@ -294,6 +295,7 @@
${fns:abbr(cfg.group1Name,20)} ${fns:abbr(cfg.group1Name,20)}
</a> </a>
</td> </td>
<td>${cfg.resGroup1Num }</td>
<td>${cfg.minTtl }</td> <td>${cfg.minTtl }</td>
<td>${cfg.maxTtl }</td> <td>${cfg.maxTtl }</td>
<td> <td>