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

ip类配置drop,loop action审核的时候走callback接口入INLINE_IP_CB表

Browse Source
This commit is contained in:
wangxin
2018-06-05 17:28:45 +08:00
parent c4ce70c3d6
commit 8adaa4a9ec
3 changed files with 315 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.callback.InlineIp;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
@@ -27,6 +29,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.IpCfgDao;
@@ -168,10 +171,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
beans1.add(area);
}
this.auditIpBatch(beans1);
List<MaatCfg> configCompileList = new ArrayList<>();
List<GroupCfg> groupRelationList = new ArrayList<>();
// List<GroupCfg> areaGroupRelationList = new ArrayList<>();
List<IpCfg> ipRegionList = new ArrayList<>();
List<StringCfg> strRegionList = new ArrayList<>();
List<NumBoundaryCfg> numRegionList = new ArrayList<>();
@@ -184,8 +185,11 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
String json="";
if(cfg.getIsAudit()==1){
if(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction()){
List<InlineIp> ipList=new ArrayList<>();
InlineIp ip=convertCallBackIp(cfg);
ipList.add(ip);
//调用服务接口下发配置数据
json=gsonToJson(cfg);
json=gsonToJson(ipList);
logger.info("IP管控下发配置参数："+json);
//调用服务接口下发配置
try {
@@ -201,6 +205,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
Map<String,List> map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList);
ipRegionList=map.get("dstList");
groupRelationList=map.get("groupList");
numRegionList=map.get("numRegionList");
Map<String,List> areaMap = cfgConvert(areaIpRegionList,beans1,1,cfg,groupRelationList);
groupRelationList=areaMap.get("groupList");
areaIpRegionList=areaMap.get("dstList");
@@ -238,10 +243,11 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
}
}else if(cfg.getIsAudit()==3){
if(Constants.DROP_ACTION==cfg.getAction()||Constants.LOOP_ACTION==cfg.getAction()){
Map<String,Object> map=new HashMap<String, Object>();
map.put("updateStatCfgList", cfg);
List<InlineIp> ipList=new ArrayList<>();
InlineIp ip=convertCallBackIp(cfg);
ipList.add(ip);
//调用服务接口取消配置
json=gsonToJson(map);
json=gsonToJson(ipList);
logger.info("IP管控配置参数："+json);
//调用服务接口取消配置
try {