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

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -100,8 +101,14 @@ public class DnsIpCfgController extends BaseController {
}
@RequestMapping(value = {"/audit"})
@RequiresPermissions(value={"dns:fake:ip:confirm"})
public String audit(Integer isAudit,Integer isValid,String ids
,Integer functionId, RedirectAttributes redirectAttributes) {
public String audit(Model model,@ModelAttribute("cfg")DnsIpCfg cfg,
Integer isValid,
Integer isAudit,
String ids,
Integer functionId,
RedirectAttributes redirectAttributes,
HttpServletResponse response,
HttpServletRequest request) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -120,6 +127,24 @@ public class DnsIpCfgController extends BaseController {
}
}else {
Page<DnsIpCfg> searchPage=new Page<DnsIpCfg>(request,response,"r");
Page<DnsIpCfg> auditPage=new Page<DnsIpCfg>(request,response,"r");
try {
BeanUtils.copyProperties(searchPage, auditPage);
auditAll(auditPage,isValid , cfg);
} catch (Exception e) {
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
}
return list(model, request, response,cfg, redirectAttributes);
}
return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
}

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

@@ -9,6 +9,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.taglibs.standard.functions.Functions;
import org.springframework.stereotype.Controller;
@@ -118,8 +119,14 @@ public class DnsResStrategyController extends BaseController {
@RequestMapping(value = {"/audit"})
@RequiresPermissions(value={"dns:res:strategy:confirm"})
public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId,
RedirectAttributes redirectAttributes) {
public String audit(Model model,@ModelAttribute("cfg")DnsResStrategy cfg,
Integer isValid,
Integer isAudit,
String ids,
Integer functionId,
RedirectAttributes redirectAttributes,
HttpServletResponse response,
HttpServletRequest request) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");
Date auditTime=new Date();
@@ -133,6 +140,24 @@ public class DnsResStrategyController extends BaseController {
}
}
}else {
Page<DnsResStrategy> searchPage=new Page<DnsResStrategy>(request,response,"r");
Page<DnsResStrategy> auditPage=new Page<DnsResStrategy>(request,response,"r");
try {
BeanUtils.copyProperties(searchPage, auditPage);
auditAll(auditPage,isValid , cfg);
} catch (Exception e) {
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
}
return list(model, request, response, cfg,redirectAttributes);
}
return "redirect:" + adminPath +"/maintenance/dnsResStrategy/list?functionId="+functionId;
}