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

同步方法的userRegion变量值设置

Browse Source
This commit is contained in:
DuanDongmei
2018-12-09 14:00:50 +08:00
parent 3a8977de84
commit 860d1ca82e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,7 +407,7 @@ public class ConfigSynchronizationService extends BaseService{
ipRegionList.addAll(ipRegionList); ipRegionList.addAll(ipRegionList);
} }
//配置域转换 //配置域转换
configCovert(ipList,strList,complexStrList, userRegion = configCovert(ipList,strList,complexStrList,
numList,fileList,regionIds,groupIds,entity,cfg.getCompileId(), numList,fileList,regionIds,groupIds,entity,cfg.getCompileId(),
StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime(), StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime(),
groupRelationList,ipRegionList,strRegionList,numRegionList,digestRegionList,areaIpRegionList,userRegion); groupRelationList,ipRegionList,strRegionList,numRegionList,digestRegionList,areaIpRegionList,userRegion);
@@ -811,7 +811,7 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); // JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null);
} }
} }
return hasData; return hasData;
@@ -1784,7 +1784,7 @@ public class ConfigSynchronizationService extends BaseService{
* @param areaIpRegionList * @param areaIpRegionList
* @param userRegion * @param userRegion
*/ */
public void configCovert(List<IpPortCfg> ipList,List<BaseStringCfg> strList,List<ComplexkeywordCfg> complexStrList, public String configCovert(List<IpPortCfg> ipList,List<BaseStringCfg> strList,List<ComplexkeywordCfg> complexStrList,
List<com.nis.domain.configuration.NumBoundaryCfg > numList, List<com.nis.domain.configuration.NumBoundaryCfg > numList,
List<FileDigestCfg> fileList,List<Integer> regionIds,List<Integer> groupIds,BaseCfg entity, List<FileDigestCfg> fileList,List<Integer> regionIds,List<Integer> groupIds,BaseCfg entity,
Integer compileId,Date auditTime,List<GroupCfg> groupRelationList, Integer compileId,Date auditTime,List<GroupCfg> groupRelationList,
@@ -1910,5 +1910,6 @@ public class ConfigSynchronizationService extends BaseService{
groupRelationList=map.get("groupList"); groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList"); digestRegionList=map.get("dstList");
} }
return userRegion;
} }
} }