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

将策略分组、欺骗ip、dns策略、bgp、音视频文本、文件摘要、http内容替换业务Controller方法返回对象修改为redirectAttribute

Browse Source
This commit is contained in:
duandongmei
2018-07-02 14:07:47 +08:00
parent d36e618a4d
commit ab0ed9ce05
7 changed files with 220 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
View File

@@ -32,7 +32,9 @@ import com.nis.web.service.configuration.DnsIpCfgService;
public class DnsIpCfgController extends BaseController {
@RequestMapping(value = {"/list"})
public String list(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity){
public String list(Model model,HttpServletRequest request
,HttpServletResponse response,@ModelAttribute("cfg")DnsIpCfg entity
,RedirectAttributes redirectAttributes){
Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
initPageCondition(model);
@@ -40,7 +42,9 @@ public class DnsIpCfgController extends BaseController {
}
@RequestMapping(value = {"/form"})
@RequiresPermissions(value={"dns:fake:ip:config"})
public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg){
public String form(Model model,HttpServletRequest request
,HttpServletResponse response,String ids,@ModelAttribute("cfg")DnsIpCfg cfg
,RedirectAttributes redirectAttributes){
if(!StringUtil.isEmpty(ids)){
cfg = dnsIpCfgService.getDnsIpCfg(Long.parseLong(ids));
initUpdateFormCondition(model, cfg);
@@ -56,15 +60,17 @@ public class DnsIpCfgController extends BaseController {
@RequestMapping(value = {"/saveOrUpdate"})
@RequiresPermissions(value={"dns:fake:ip:config"})
public String saveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,
@ModelAttribute("cfg")DnsIpCfg cfg){
public String saveOrUpdate(Model model,HttpServletRequest request
,HttpServletResponse response,
@ModelAttribute("cfg")DnsIpCfg cfg
,RedirectAttributes redirectAttributes){
try{
dnsIpCfgService.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 +"/cfg/dnsIp/list?functionId="+cfg.getFunctionId();
@@ -72,13 +78,16 @@ public class DnsIpCfgController extends BaseController {
@RequestMapping(value = {"/delete"})
@RequiresPermissions(value={"dns:fake:ip:config"})
public String delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
public String delete(Integer isAudit,Integer isValid
,String ids,Integer functionId
,RedirectAttributes redirectAttributes){
dnsIpCfgService.delete(isAudit,isValid,ids,functionId);
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
}
@RequestMapping(value = {"/audit"})
//@RequiresPermissions(value={"dns:fake:ip: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();

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

@@ -38,33 +38,29 @@ public class DnsResStrategyController extends BaseController {
String ids,
@ModelAttribute("cfg")DnsResStrategy cfg
,RedirectAttributes redirectAttributes){
try {
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("无策略");
}
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());
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("无策略");
}
initFormCondition(model, cfg);
model.addAttribute("isAdd", true);
}
//查询policyGroup列表，供响应策略选择
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(1);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", cfg);
return "/cfg/maintenance/dnsResStrategy/form";
}
@@ -90,15 +86,10 @@ public class DnsResStrategyController extends BaseController {
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");
}
//查询时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";
}
@@ -108,13 +99,8 @@ public class DnsResStrategyController extends BaseController {
,Model model,HttpServletRequest request
,HttpServletResponse response
,RedirectAttributes redirectAttributes){
try{
if(!StringUtil.isEmpty(ids)){
dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
}
addMessage(redirectAttributes,"delete_success");
}catch(Exception e){
addMessage(redirectAttributes,"delete_failed");
if(!StringUtil.isEmpty(ids)){
dnsResStrategyService.delete(isAudit,isValid,ids,functionId);
}
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
@@ -131,8 +117,6 @@ public class DnsResStrategyController extends BaseController {
try {
dnsResStrategyService.audit(isAudit,isValid,functionId,id,auditTime);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("VOIP配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}