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

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,
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<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";
}
@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<DnsResStrategy> page = dnsResStrategyService.findPage(new Page<DnsResStrategy>(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<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";
}
@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();