diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 46f9e67b4..cedbdf3eb 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -407,7 +407,7 @@ public class ConfigSynchronizationService extends BaseService{ ipRegionList.addAll(ipRegionList); } //配置域转换 - configCovert(ipList,strList,complexStrList, + userRegion = configCovert(ipList,strList,complexStrList, numList,fileList,regionIds,groupIds,entity,cfg.getCompileId(), StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime(), groupRelationList,ipRegionList,strRegionList,numRegionList,digestRegionList,areaIpRegionList,userRegion); @@ -811,7 +811,7 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true: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; @@ -1784,7 +1784,7 @@ public class ConfigSynchronizationService extends BaseService{ * @param areaIpRegionList * @param userRegion */ - public void configCovert(List ipList,List strList,List complexStrList, + public String configCovert(List ipList,List strList,List complexStrList, List numList, List fileList,List regionIds,List groupIds,BaseCfg entity, Integer compileId,Date auditTime,List groupRelationList, @@ -1910,5 +1910,6 @@ public class ConfigSynchronizationService extends BaseService{ groupRelationList=map.get("groupList"); digestRegionList=map.get("dstList"); } + return userRegion; } }