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

全量同步/批量下发/定时任务域名相关自定义处理BUG更改

Browse Source
This commit is contained in:
段冬梅
2019-04-17 17:49:23 +08:00
parent 6ac930fd22
commit 4725a3ff90
4 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,6 +305,8 @@ public class ConfigSynchronizationService extends BaseService{
commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null);
}
}
//用于存储自定义域为关键字的业务，key=compileId，value=keyword.
Map<Integer, BaseStringCfg> keywordMap=new HashMap<>();
if(cfgList!=null){
for(Map<String,Object> m:cfgList){
@@ -312,7 +314,15 @@ public class ConfigSynchronizationService extends BaseService{
if("1".equals(m.get("cfgType"))){
ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
}else if("2".equals(m.get("cfgType"))){
strList.addAll(configSynchronizationDao.getStrList(tableName,compileIds));
List<BaseStringCfg> strDataList=configSynchronizationDao.getStrList(tableName,compileIds);
strList.addAll(strDataList);
//512/521/514/1026业务的用户自定义域取DOMAIN_STR取自Keyword
if(entity.getServiceId()==512
||entity.getServiceId()==521
||entity.getServiceId()==514
||entity.getServiceId()==1026) {
keywordMap=configSynchronizationDao.getCompileIdWithKeyword(tableName, compileIds);
}
}else if("3".equals(m.get("cfgType"))){
complexStrList.addAll(configSynchronizationDao.getComplexStrList(tableName,compileIds));
}else if("4".equals(m.get("cfgType"))){
@@ -381,17 +391,18 @@ public class ConfigSynchronizationService extends BaseService{
if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){
value = "0";
}else if(regionKey.equals("DOMAIN_STR")) {
if(!StringUtil.isEmpty(strList)) {
value = strList.get(0).getCfgKeywords();
if(!StringUtil.isEmpty(keywordMap) && !StringUtil.isEmpty(keywordMap.get(cfg.getCompileId()))) {
value = keywordMap.get(cfg.getCompileId()).getCfgKeywords();
}
}else if(regionKey.equals("DOMAIN_ID")) {
if(!StringUtil.isEmpty(keywordMap) && !StringUtil.isEmpty(keywordMap.get(cfg.getCompileId()))) {
value = cfg.getCompileId();
}
}else {
if(regionKey.equals("DOMAIN_ID") && StringUtil.isEmpty(strList)) {
value="";
}else {
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
value = field.get(cfg);
}
Field field = aClass.getDeclaredField(regionColumn);
field.setAccessible(true);
value = field.get(cfg);
}
if(!StringUtil.isEmpty(value)){
if(StringUtil.isEmpty(n.get("regionKey"))){