DNS reject增加策略分组功能

This commit is contained in:
duandongmei
2018-06-22 15:59:47 +08:00
parent 41024e872c
commit b6d0ece058
22 changed files with 169 additions and 45 deletions

View File

@@ -1,158 +0,0 @@
package com.nis.web.controller.configuration.ntc;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.basics.SysDictInfo;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvContIpCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.exceptions.MaatConvertException;
import com.nis.domain.configuration.AvVoipIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.StringUtil;
import com.nis.util.excel.ExportExcel;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
/**
* dns响应策略
* @author ddm
*
*/
@Controller
@RequestMapping("${adminPath}/maintenance/dnsResStrategy")
public class DnsResStrategyController extends BaseController {
@RequestMapping(value = {"/form"})
@RequiresPermissions(value={"dns:res:strategy:config"})
public String from(Model model,
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);
}
initFormCondition(model, cfg);
model.addAttribute("isAdd", true);
}
//查询policyGroup列表供响应策略选择
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfos();
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){
try{
dnsResStrategyService.saveOrUpdate(cfg);
addMessage(model,"save_success");
}catch(Exception e){
e.printStackTrace();
addMessage(model,"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);
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){
try{
if(!StringUtil.isEmpty(ids)){
dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
}
addMessage(model,"delete_success");
}catch(Exception e){
addMessage(model,"delete_failed");
}
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
}
@RequestMapping(value = {"/audit"})
//@RequiresPermissions(value={"dns:res:strategy:audit"})
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();
for(String id :idArray){
try {
dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("VOIP配置下发失败"+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}
}
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
}
@ResponseBody
@RequestMapping(value = "/validCfgId")
public boolean validCfgId(Long cfgId) {
DnsResStrategy dns=dnsResStrategyService.getDnsResStrategy(cfgId,null);
if(dns == null ){
return false;
}else{
return true;
}
}
}

View File

@@ -23,6 +23,7 @@ import com.nis.domain.Page;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.ComplexStringCfgTemplate;
import com.nis.domain.configuration.IpCfgTemplate;
import com.nis.domain.configuration.StringCfgTemplate;
@@ -299,6 +300,9 @@ public class WebsiteController extends BaseController{
}else{
initFormCondition(model,entity);
}
//获取所有响应策略信息
List<DnsResStrategy> resStrategys=dnsResStrategyService.findDnsResStrategys(null, 1,1);
model.addAttribute("dnsResStrategys", resStrategys);
model.addAttribute("_cfg", entity);
return "/cfg/website/dnsForm";
}