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

增加同步指令下发与同步状态获取功能，修改同步下发配置的asn业务逻辑

Browse Source
This commit is contained in:
zhangwei
2018-11-27 16:57:08 +08:00
parent 85fc51134c
commit 80e6bbb53d
8 changed files with 186 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -21,6 +21,7 @@ import antlr.StringUtils;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.BaseCfg;
@@ -176,6 +177,7 @@ public class ConfigSynchronizationService extends BaseService{
List<IpPortCfg> ipList = new ArrayList();
List<AsnIpCfg> asnIpList = new ArrayList();
List<BaseStringCfg> strList = new ArrayList();
List<ComplexkeywordCfg> complexStrList = new ArrayList();
List<com.nis.domain.configuration.NumBoundaryCfg> numList = new ArrayList();
@@ -183,15 +185,19 @@ public class ConfigSynchronizationService extends BaseService{
maatBean = new ToMaatBean();
configCompileList = new ArrayList();
List<Integer> compileIds = new ArrayList();
List<String> asnGroupIds = new ArrayList();
for(CfgIndexInfo cfg:list){
compileIds.add(cfg.getCompileId());
if(entity.getServiceId().equals(37)||entity.getServiceId().equals(149)){
asnGroupIds.add(cfg.getUserRegion4());
}
}
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
String tableName = m.get("tableName").toString();
if("1".equals(m.get("cfgType"))){
if(tableName.equals("asn_ip_cfg")){
asnIpList.addAll(configSynchronizationDao.getAsnIpList(asnGroupIds));
}else{
ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
}
@@ -215,7 +221,7 @@ public class ConfigSynchronizationService extends BaseService{
numRegionList = new ArrayList();
digestRegionList = new ArrayList();
areaIpRegionList = new ArrayList();
List<IpPortCfg> list1 = new ArrayList();
List list1 = new ArrayList();
List<BaseStringCfg> list2 = new ArrayList();
List<ComplexkeywordCfg> list3 = new ArrayList();
List<com.nis.domain.configuration.NumBoundaryCfg> list4 = new ArrayList();
@@ -268,6 +274,11 @@ public class ConfigSynchronizationService extends BaseService{
list1.add(ip);
}
}
for(AsnIpCfg ip:asnIpList){
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
list1.add(ip);
}
}
for(BaseStringCfg str:strList){
if(str.getCompileId().equals(cfg.getCompileId())){
list2.add(str);
@@ -307,11 +318,15 @@ public class ConfigSynchronizationService extends BaseService{
}
if(list1.size()>0){
ipList.removeAll(list1);
Map<String,List> map = cfgConvert(ipRegionList,list1,1,cfg,groupRelationList);
groupRelationList=map.get("groupList");
ipRegionList=map.get("dstList");
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
if(entity.getServiceId().equals(37)||entity.getServiceId().equals(149)){//asn业务
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null));
}else{
Map<String,List> map = cfgConvert(ipRegionList,list1,1,cfg,groupRelationList);
groupRelationList=map.get("groupList");
ipRegionList=map.get("dstList");
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
}
}
if(list2.size()>0){
@@ -367,7 +382,7 @@ public class ConfigSynchronizationService extends BaseService{
maatBean.setOpAction(Constants.INSERT_ACTION);
String json=gsonToJson(maatBean);
//调用服务接口配置全量更新
ToMaatResult result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
}
return hasData;
}
@@ -518,7 +533,7 @@ public class ConfigSynchronizationService extends BaseService{
maatBean.setOpAction(Constants.INSERT_ACTION);
String json=gsonToJson(maatBean);
//调用服务接口配置全量更新
ToMaatResult result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
}
return hasData;
}
@@ -640,7 +655,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(newList);
logger.info("回调类配置同步："+json);
//调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),(hasData?null:"FINISHED"));
JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),(hasData?null:"FINISHED"));
// logger.info("回调类配置同步："+result.getMsg());
return hasData;