diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index 2e08dbc..e8ea754 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1282,14 +1282,20 @@ public class ConfigSourcesService extends BaseService { while (serviceIterator.hasNext()) { Integer service =Integer.valueOf(serviceIterator.next().toString()); List dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); - for (Integer dbIndex : dbIndexList) { - if (configMap.containsKey(dbIndex)) { - configMap.get(dbIndex).addAll(maatMap.get(service)); - }else{ - List list = new ArrayList(); - list.addAll(maatMap.get(service)); - configMap.put(dbIndex, list); + if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) { + for (Integer dbIndex : dbIndexList) { + if (configMap.containsKey(dbIndex)) { + configMap.get(dbIndex).addAll(maatMap.get(service)); + }else{ + List list = new ArrayList(); + list.addAll(maatMap.get(service)); + configMap.put(dbIndex, list); + } } + }else { + RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在"); + msgList.add(e); + return "error"; } } @@ -1362,14 +1368,20 @@ public class ConfigSourcesService extends BaseService { while (serviceIterator.hasNext()) { Integer service =Integer.valueOf(serviceIterator.next().toString()); List dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); - for (Integer dbIndex : dbIndexList) { - if (restMap.containsKey(dbIndex)) { - restMap.get(dbIndex).put(service, compileMap.get(service)); - }else{ - Map> map = new HashMap>(); - map.put(service, compileMap.get(service)); - restMap.put(dbIndex, map); + if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) { + for (Integer dbIndex : dbIndexList) { + if (restMap.containsKey(dbIndex)) { + restMap.get(dbIndex).put(service, compileMap.get(service)); + }else{ + Map> map = new HashMap>(); + map.put(service, compileMap.get(service)); + restMap.put(dbIndex, map); + } } + }else { + RuntimeException e = new RuntimeException("service值为"+service+",与写入数据库序号映射关系不存在"); + msgList.add(e); + return "error"; } } try { @@ -2552,14 +2564,20 @@ public class ConfigSourcesService extends BaseService { while (serviceIterator.hasNext()) { Integer service =Integer.valueOf(serviceIterator.next().toString()); List dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); - for (Integer dbIndex : dbIndexList) { - if (configMap.containsKey(dbIndex)) { - configMap.get(dbIndex).addAll(dstMaps.get(service)); - }else{ - List> list = new ArrayList>(); - list.addAll(dstMaps.get(service)); - configMap.put(dbIndex, list); + if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) { + for (Integer dbIndex : dbIndexList) { + if (configMap.containsKey(dbIndex)) { + configMap.get(dbIndex).addAll(dstMaps.get(service)); + }else{ + List> list = new ArrayList>(); + list.addAll(dstMaps.get(service)); + configMap.put(dbIndex, list); + } } + }else { + RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在"); + msgList.add(e); + return "error"; } } @@ -2607,14 +2625,20 @@ public class ConfigSourcesService extends BaseService { while (serviceIterator.hasNext()) { Integer service =Integer.valueOf(serviceIterator.next().toString()); List dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); - for (Integer dbIndex : dbIndexList) { - if (restMap.containsKey(dbIndex)) { - restMap.get(dbIndex).put(service, cfgMap.get(service)); - }else{ - Map> map = new HashMap>(); - map.put(service, cfgMap.get(service)); - restMap.put(dbIndex, map); + if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) { + for (Integer dbIndex : dbIndexList) { + if (restMap.containsKey(dbIndex)) { + restMap.get(dbIndex).put(service, cfgMap.get(service)); + }else{ + Map> map = new HashMap>(); + map.put(service, cfgMap.get(service)); + restMap.put(dbIndex, map); + } } + }else { + RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在"); + msgList.add(e); + return "error"; } } configRedisService.delUnMaatConfig(restMap); diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml index 6dd52dd..bbf92ee 100644 --- a/src/main/resources/maatXml/maat.xml +++ b/src/main/resources/maatXml/maat.xml @@ -45,7 +45,7 @@ - + EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] @@ -84,7 +84,7 @@ - + EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] @@ -126,7 +126,7 @@ - + EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] diff --git a/src/main/resources/serviceTable.properties b/src/main/resources/serviceTable.properties index c631cab..5599b69 100644 --- a/src/main/resources/serviceTable.properties +++ b/src/main/resources/serviceTable.properties @@ -1,6 +1,6 @@ ################################################################################# ####maat格式配置各业务类型对应的编译,分组,域配置等的表名 -####1:固定需要写service=业务类型1;业务类型2 +####1:固定需要写service=业务类型1:动作;业务类型2:动作 ####2:然后每个业务类型:业务类型1=type1:表名1;type2:表名2;type3:表名3 ####3:例如:80=10:MM_COMPILE;11:MM_GROUP;12:AV_CONT_IP_PORT ####4:type中10代表是编译配置,11代表是分组配置,12代表是ip类域配置,13代表是数值类配置,14代表是字符串类域配置,15代表是增强字符串类域配置,16代表是文件摘要类域配置,17代表是文本相似性域配置 @@ -92,7 +92,8 @@ unMaatService=3:32;4:96;25:32;28:32;29:32;261:16;262:16;263:16;264:16;265:16;266 394=0:MM_PORN_VIDEO_LEVEL ##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个 -serviceDBIndex=3:2,3;1:2;80:2;81:2;82:2;83:2;84:2;85:2;144:2;145:2;146:2;147:2;148:2;149:2;96:3;97:3;98:3;99:3;160:3,4;161:3;162:3;163:3;100:3;101:3;164:3;165:3 +#serviceDBIndex=3:2,3;1:2;80:2;81:2;82:2;83:2;84:2;85:2;144:2;145:2;146:2;147:2;148:2;149:2;96:3;97:3;98:3;99:3;160:3,4;161:3;162:3;163:3;100:3;101:3;164:3;165:3 +serviceDBIndex=1:2,3,4;2:2,3,4;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;256:2;257:2;258:2;259:2;260:2;384:2;385:2;386:2;387:2;388:2;512:2;513:2;528:2;529:2;544:2;545:2;560:2;561:2;