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

dns关键字组配置审核功能

Browse Source
This commit is contained in:
zhangdongxu
2019-02-25 10:16:57 +08:00
parent 2dd73adfbb
commit 9942cfe1e7
8 changed files with 533 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/nis/web/controller/basics/DnsKeywordController.java
View File

@@ -1,39 +1,27 @@
package com.nis.web.controller.basics;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jersey.repackaged.com.google.common.collect.Lists;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
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.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsKeywordCfg;
import com.nis.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
@@ -119,7 +107,7 @@ public class DnsKeywordController extends BaseController{
,HttpServletResponse response
,RedirectAttributes redirectAttributes) {
//选中配置审核
/*if(!StringUtil.isEmpty(ids)) {
if(!StringUtil.isEmpty(ids)) {
List<DnsKeywordCfg> infoList=dnsKeywordCfgService.getByIds(ids);
Map<Long,List<DnsKeywordCfg>> dnsKeywordMap=Maps.newHashMap();
for(DnsKeywordCfg entity:infoList) {
@@ -136,10 +124,10 @@ public class DnsKeywordController extends BaseController{
dnsKeywordMap.put(Long.parseLong(entity.getUserRegion1()), keywords);
}
}
*//********************每次下发一个组的region，保证事物********************//*
//********************每次下发一个组的region，保证事物********************//*
for (Long groupId : dnsKeywordMap.keySet()) {
try {
dnsKeywordCfgService.auditDnsKeywordBatch(dnsKeywordMap.get(groupId),groupId,isValid);
dnsKeywordCfgService.auditDnsKeywordBatch(dnsKeywordMap.get(groupId),groupId,isAudit,isValid);
} catch (Exception e) {
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
@@ -150,7 +138,7 @@ public class DnsKeywordController extends BaseController{
}
}
}else {
}/*else {
//条件下所有配置审核
Page<AsnIpCfg> searchPage=new Page<AsnIpCfg>(request,response,"a");
Page<AsnIpCfg> auditPage=new Page<AsnIpCfg>(request,response,"a");