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

修改取消配置时报错的问题

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-06-04 18:29:06 +08:00
parent 0b38d89c18
commit 699f81edbc
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java
View File

@@ -721,20 +721,20 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
if (compileId.longValue() == id.longValue()) {// if (compileId.longValue() == id.longValue()) {//
Set<String> regionIdSet = maatRelation.getGroupAndRegionMap().get(groupId); Set<String> regionIdSet = maatRelation.getGroupAndRegionMap().get(groupId);
if (regionIdSet != null && regionIdSet.size() > 0) { if (regionIdSet != null && regionIdSet.size() > 0) {
removeRegionConfig(maatXmlConfig, regionIdSet, 12, maatVersion.doubleValue(), removeRegionConfig(maatXmlConfig, regionIdSet, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 12代表是ip类域配置 service, redisTemplate, redisDBIndex);// 12代表是ip类域配置
removeRegionConfig(maatXmlConfig, regionIdSet, 13, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 13, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 13代表是数值类配置 // service, redisTemplate, redisDBIndex);// 13代表是数值类配置
removeRegionConfig(maatXmlConfig, regionIdSet, 14, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 14, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 14代表是字符串类域配置 // service, redisTemplate, redisDBIndex);// 14代表是字符串类域配置
removeRegionConfig(maatXmlConfig, regionIdSet, 15, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 15, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 15代表是增强字符串类域配置 // service, redisTemplate, redisDBIndex);// 15代表是增强字符串类域配置
removeRegionConfig(maatXmlConfig, regionIdSet, 16, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 16, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 16代表是文件摘要类域配置 // service, redisTemplate, redisDBIndex);// 16代表是文件摘要类域配置
removeRegionConfig(maatXmlConfig, regionIdSet, 17, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 17, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 17代表是文本相似性域配置 // service, redisTemplate, redisDBIndex);// 17代表是文本相似性域配置
removeRegionConfig(maatXmlConfig, regionIdSet, 18, maatVersion.doubleValue(), // removeRegionConfig(maatXmlConfig, regionIdSet, 18, maatVersion.doubleValue(),
service, redisTemplate, redisDBIndex);// 18代表是区域ip域配置 // service, redisTemplate, redisDBIndex);// 18代表是区域ip域配置
} }
} }
} }
@@ -832,7 +832,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
} }
} }
private void removeRegionConfig(MaatXmlConfig maatXmlConfig, Set<String> idList, int type, Double maatVersion, private void removeRegionConfig(MaatXmlConfig maatXmlConfig, Set<String> idList, Double maatVersion,
int service, RedisTemplate<String, String> redisTemplate, int redisDBIndex) { int service, RedisTemplate<String, String> redisTemplate, int redisDBIndex) {
if (maatXmlConfig != null && idList != null && idList.size() > 0) { if (maatXmlConfig != null && idList != null && idList.size() > 0) {
List<MaatXmlExpr> expressionList = maatXmlConfig.getExpressionList(); List<MaatXmlExpr> expressionList = maatXmlConfig.getExpressionList();