From 6d9f4e10a2f2017ba35c3bf509b4b9ae8e1f57ee Mon Sep 17 00:00:00 2001 From: renkaige Date: Thu, 10 Jan 2019 18:58:06 +0600 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=87=E6=8D=A2=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 5 +- .../restful/ConfigSourcesController.java | 5 +- .../restful/ConfigJedisServiceimpl.java | 361 ++++++++++-------- .../service/restful/ConfigRedisService.java | 16 +- .../service/restful/ConfigSourcesService.java | 83 ++-- 5 files changed, 265 insertions(+), 205 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 193ac00..44d139c 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -237,8 +237,9 @@ public final class Constants { public static final int TAPREDISDB = Configurations.getIntProperty("tapRedisDb", 5); //webfocus库db public static final int WEBFOCUSREDISDB = Configurations.getIntProperty("webFocusDb", 7); - - // + //记录公共组向哪些redis-db写入 + public static final String[] COMMONGROUPDB =org.apache.commons.lang.StringUtils.split(Configurations.getStringProperty("commonGroupDb", "2,3,4,5,7"), ","); + //流量统计趋势图粒度 public static final int TREND_TIME_INTERVAL = Configurations.getIntProperty("traffic.trend.timeInterval", 5); } diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 83ae455..0f23e4e 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.nis.domain.restful.ConfigCompile; -import com.nis.domain.restful.ConfigCompileStartStop; import com.nis.domain.restful.ConfigSource; import com.nis.domain.restful.ConfigSourceStartStop; import com.nis.domain.restful.FileDesc; @@ -140,7 +139,7 @@ public class ConfigSourcesController extends BaseRestController { Constants.OPACTION_PUT); configSourcesService.updateConfigSources(thread, start, configSourceStartStop.getConfigCompileStartStopList(), - configSourceStartStop.getOpTime(), sb,true); + configSourceStartStop.getOpTime(), sb); } @@ -191,7 +190,7 @@ public class ConfigSourcesController extends BaseRestController { } checkOpAction(thread, System.currentTimeMillis() - start, opAction, 2); configSourcesService.updateConfigSources(thread, start, configSource.getConfigCompileList(), - configSource.getOpTime(), sb,false); + configSource.getOpTime(), sb); } else { throw new RestServiceException("Maat规则不能为空" + sb.toString(), diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index b238c24..ffddd83 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -39,7 +39,7 @@ import redis.clients.jedis.exceptions.JedisConnectionException; @Service() public class ConfigJedisServiceimpl implements ConfigRedisService { private static Logger logger = LoggerFactory.getLogger(ConfigJedisServiceimpl.class); - +// Constants.COMMONGROUPDBARR // 用于在实时统计配置后面添加时间,方便读取入库时间 private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -435,11 +435,10 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } } return groupAndRegionMap; - } @Override - public boolean saveMaatConfig(Map> configMap) { + public boolean saveMaatConfig(Map> configMap, List commonGroupIdList) { if (configMap != null && configMap.size() > 0) { int count = 0; Jedis resource = JedisUtils.getResource(0); @@ -470,7 +469,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(service); setConfig(maatConfig, maatXmlConfig, maatVersion, service, transaction, - redisDBIndex); + redisDBIndex, commonGroupIdList); } transaction.incrBy("MAAT_VERSION", 1l); @@ -527,31 +526,25 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * @param redisDBIndex */ public void setConfig(MaatConfig maatConfig, MaatXmlConfig maatXmlConfig, Double maatVersion, int service, - Transaction transaction, Integer redisDBIndex) { + Transaction transaction, Integer redisDBIndex, List commonGroupIdList) { Map compileMap = maatConfig.getCompileMap(); String compileId = compileMap.get("compile_id"); if (compileMap != null && compileMap.size() > 0) { - setCommonConfig(maatXmlConfig, compileMap, 10, maatVersion, service, transaction, redisDBIndex, null, - false);// 10代表是编译配置 + setCommonConfig(maatXmlConfig, compileMap, 10, maatVersion, service, transaction, redisDBIndex, null);// 10代表是编译配置 } else { throw new ServiceRuntimeException( "无法从参数中获取" + redisDBIndex + "号redis库,业务类型为:" + service + "的编译配置信息,请检查配置参数是否正确", RestBusinessCode.NotFoundCompileInfo.getValue()); } - boolean isReuse = false; /** * 保存域配置信息 */ - int count = addRegion(maatConfig, maatXmlConfig, maatVersion, service, transaction, redisDBIndex, false); - if (count == 0 && ServiceAndRDBIndexReal.serviceIsReuse(service)) { - isReuse = true;// 如果没有域配置那么就是分组复用的配置,只有分组复用的配置才可以没有域配置 - } + addRegion(maatConfig, maatXmlConfig, maatVersion, service, transaction, redisDBIndex, commonGroupIdList); List> groupMapList = maatConfig.getGroupMapList(); if (groupMapList != null && groupMapList.size() > 0) { for (Map map : groupMapList) { - setCommonConfig(maatXmlConfig, map, 11, maatVersion, service, transaction, redisDBIndex, compileId, - isReuse);// 11代表是分组配置 + setCommonConfig(maatXmlConfig, map, 11, maatVersion, service, transaction, redisDBIndex, compileId);// 11代表是分组配置 } } else { throw new ServiceRuntimeException( @@ -574,7 +567,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * @param isReuse 是否是分组复用 */ private void setCommonConfig(MaatXmlConfig maatXmlConfig, Map map, int type, Double maatVersion, - int service, Transaction transaction, Integer redisDBIndex, String compileId, boolean isReuse) { + int service, Transaction transaction, Integer redisDBIndex, String compileId) { if (maatXmlConfig != null && map != null && map.size() > 0) { List expressionList = maatXmlConfig.getExpressionList(); String maatKey = null; @@ -675,41 +668,6 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { transaction.set(maatKey.toUpperCase(), valBF.toString()); logger.info("向{}号redis数据库添加了一条配置,key是{},value是{}", redisDBIndex, maatKey.toUpperCase(), valBF.toString()); - if (isReuse && type == 11) { - int tmpStorageReuseRegionDB = Configurations.getIntProperty("tmpStorageReuseRegionDB", 15); - int idRelaRedisDBIndex = Configurations.getIntProperty("idRelaRedisDBIndex", 15); - String groupIdStr = "GROUPREGION:" + groupId; - String groupCompileVal = JedisUtils.get(groupIdStr, idRelaRedisDBIndex); - if (groupCompileVal != null && !groupCompileVal.trim().equals("")) { - Set regionKeySet = new HashSet();// 获取当前组下所有的域,并将该域往当前组所在的redisdb复制一份 - String[] split = org.apache.commons.lang.StringUtils.split(groupCompileVal, ";"); - - if (split != null && split.length > 0) { - for (String compileStr : split) { - if (compileStr != null && !compileStr.trim().equals("")) { - regionKeySet.add(compileStr.split("-")[0].trim()); - } - } - } - transaction.select(redisDBIndex); - for (String regionKey : regionKeySet) { - if (!JedisUtils.exists(regionKey, redisDBIndex)) {// 先判断是否存在,如果存在就不复制了,不存在就复制 - String regionVal = JedisUtils.get(regionKey, tmpStorageReuseRegionDB); - if (regionVal != null && !regionVal.trim().equals("")) { - transaction.set(regionKey.toUpperCase(), regionVal); - logger.info("向{}号redis数据库复制了一条域配置,key是{},value是{}", redisDBIndex, - regionKey.toUpperCase(), regionVal.toString()); - } - } - } - } - } else if (isReuse && (type == 12 || type == 13 || type == 14 || type == 15 || type == 18)) {// 将数据往临时库复制一份,无论临时库里有没有都可以直接写,有则覆盖,不影响 - int tmpStorageReuseRegionDB = Configurations.getIntProperty("tmpStorageReuseRegionDB", 15); - transaction.select(tmpStorageReuseRegionDB); - transaction.set(maatKey.toUpperCase(), valBF.toString()); - logger.info("向临时存放region的{}号redis数据库添加了一条配置,key是{},value是{}", tmpStorageReuseRegionDB, - maatKey.toUpperCase(), valBF.toString()); - } break; } @@ -896,7 +854,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 根据配置id从关联关系db中获取各个配置实际所在的db + * 根据配置id从关联关系db中获取各个配置实际所在的db,key是redisdb,value是配置id * * @param idList * @param service @@ -1011,11 +969,12 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { list.add(i); } serviceConfigMap.put(129, list); - delMaatConfig(serviceConfigMap,false); + delMaatConfig(serviceConfigMap, false, null); } @Override - public boolean delMaatConfig(Map> serviceConfigMap,boolean isStart) { + public boolean delMaatConfig(Map> serviceConfigMap, boolean isStart, + Map> compileGroupMap) { if (serviceConfigMap != null && serviceConfigMap.size() > 0) { Jedis resource = JedisUtils.getResource(0); Transaction transaction = resource.multi(); @@ -1035,8 +994,14 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { for (Long id : list) { // 按序号选择Redis数据库 transaction.select(redisDb); - removeConfig(id, maatXmlConfig, maatVersion, service, transaction, redisDb, - idRelaRedisDBIndex,isStart); + if (!isStart && compileGroupMap.size() > 0) { + removeConfig(id, maatXmlConfig, maatVersion, service, transaction, redisDb, + idRelaRedisDBIndex, isStart, compileGroupMap.get(id)); + } else { + removeConfig(id, maatXmlConfig, maatVersion, service, transaction, redisDb, + idRelaRedisDBIndex, isStart, null); + } + } } else { throw new ServiceRuntimeException("删除配置时,未发现对应的配置id信息,请检查配置参数是否正确", @@ -1056,7 +1021,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { throw new ServiceRuntimeException("删除maat类配置时,未发现对应的配置信息,请检查配置参数是否正确", RestBusinessCode.ConfigSourceIsNull.getValue()); } - if (removeMaatRelation(serviceConfigMap, transaction, isStart) + if (removeMaatRelation(serviceConfigMap, transaction, isStart, compileGroupMap) && removeStatisticsReal(serviceConfigMap, transaction, isStart)) { transaction.exec(); return true; @@ -1090,8 +1055,6 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { return false; } - - /** * 获取关联关系中每个关系中的-前部分 * @@ -1115,10 +1078,12 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * @param service 业务类型 * @param redisTemplate * @param maatRelation id对应关系对象 - * @param isStart 是否将配置置为生效 + * @param isStart 是否将配置置为生效 + * @param keepGroupId 将配置置为失效时需要保留的组 */ private void removeConfig(Long id, MaatXmlConfig maatXmlConfig, Double maatVersion, int service, - Transaction transaction, int redisDBIndex, int idRelaRedisDBIndex, boolean isStart) { + Transaction transaction, int redisDBIndex, int idRelaRedisDBIndex, boolean isStart, + List keepGroupId) { if (maatXmlConfig != null) { Map keyMap = new HashMap<>(); // 删除(重命名)编译配置 @@ -1127,16 +1092,18 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { // 拼接编译与分组关系的Redis Key String compileStr = "COMPILEGROUP:" + id; // 获取当前编译配置与分组配置的关联关系 - String compileStrVal = JedisUtils.get(compileStr, idRelaRedisDBIndex);// 根据编译id获取该编译下的分组关系 + String compileStrVal = JedisUtils.get(compileStr, idRelaRedisDBIndex);// 根据编译id获取该编译下的分组关系,示例: + // GROUPCOMPILE:25166-2,5;GROUPCOMPILE:25167-2,5;GROUPCOMPILE:25168-2,5 if (compileStrVal != null && !compileStrVal.trim().equals("")) { String[] compileGroupStrArr = org.apache.commons.lang.StringUtils.split(compileStrVal, ";"); for (String compileGroup : compileGroupStrArr) { + // compileGroup=GROUPCOMPILE:25166-2, 5 if (compileGroup != null && !compileGroup.trim().equals("")) { - String groupCompileStrs = getRegionInfo(compileGroup);// 获取编译对应的分组信息,去除后面的redisdb信息 + String groupCompileStrs = getRegionInfo(compileGroup);// 获取编译对应的分组信息,去除后面的redisdb信息,GROUPCOMPILE:25166 if (groupCompileStrs != null && !groupCompileStrs.trim().equals("")) {// 遍历编译和分组的信息 String[] split = org.apache.commons.lang.StringUtils.split(groupCompileStrs, ";"); - for (String groupId : split) {// GROUPCOMPILE:groupid-redisdb + for (String groupId : split) {// GROUPCOMPILE:groupid if (groupId != null && !groupId.trim().equals("")) { String groupCompileAndDBStrs = null; if (!keyMap.containsKey(groupId)) { @@ -1146,50 +1113,56 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { groupCompileAndDBStrs = keyMap.get(groupId); } - String[] compileGroupArr = org.apache.commons.lang.StringUtils - .split(groupCompileAndDBStrs, ";");// 获取组对应的编译id + String groupIdReal = groupId.replace("GROUPCOMPILE:", ""); + String[] compileGroupArr = org.apache.commons.lang.StringUtils + .split(groupCompileAndDBStrs, ";");// 获取组对应的编译id,示例: + // ;COMPILEGROUP:24070-2, 5 for (String groupAndCompileStr : compileGroupArr) { if (groupAndCompileStr != null && !groupAndCompileStr.trim().equals("")) { - String compileId = getRegionInfo(groupAndCompileStr); + String compileId = getRegionInfo(groupAndCompileStr);// COMPILEGROUP:24070 if (compileId != null && !compileId.trim().equals("")) { - // 被分组复用的业务,不能将域置为失效 - if (!ServiceAndRDBIndexReal.serviceIsReuse(service)) {// 如果当前业务不允许被分组复用(普通的maat类配置),则可以将域置为失效,否则不将域置为失效 - // 如果只有一个编译id且与上面的编译id相同则说明未被分组复用,可以将其下的所有域置失效,否则不处理域配置,只把编译,分组关系置为无效 - if (compileId.equals(compileStr)) {// - String groupRegionKey = groupId.replace("GROUPCOMPILE", - "GROUPREGION");// groupregion里面value是region的信息,key是group的信息,所以可以直接将GROUPCOMPILE替换为GROUPREGION - String regionStrs = null; - if (!keyMap.containsKey(groupRegionKey)) { - regionStrs = JedisUtils.get(groupRegionKey, - idRelaRedisDBIndex); - keyMap.put(groupRegionKey, regionStrs); - } else { - regionStrs = keyMap.get(groupRegionKey); - } - if (regionStrs != null && !regionStrs.trim().equals("")) { - String[] regionStrArr = regionStrs.split(";"); - for (String str : regionStrArr) { - if (str != null && !str.trim().equals("")) { + if (keepGroupId != null && keepGroupId.size() > 0 + && keepGroupId.contains(Long.parseLong(groupIdReal))) {// 包含保留的group,则不将域置为失效,否则将域置为失效,否 + if (!ServiceAndRDBIndexReal.serviceIsReuse(service)) {// 如果当前业务不允许被分组复用(普通的maat类配置),则可以将域置为失效,否则不将域置为失效 + // 如果只有一个编译id且与上面的编译id相同则说明未被分组复用,可以将其下的所有域置失效,否则不处理域配置,只把编译,分组关系置为无效 + if (compileId.equals(compileStr)) {// + String groupRegionKey = groupId.replace("GROUPCOMPILE", + "GROUPREGION");// groupregion里面value是region的信息,key是group的信息,所以可以直接将GROUPCOMPILE替换为GROUPREGION + String regionStrs = null; + if (!keyMap.containsKey(groupRegionKey)) { + regionStrs = JedisUtils.get(groupRegionKey, + idRelaRedisDBIndex); + keyMap.put(groupRegionKey, regionStrs); + } else { + regionStrs = keyMap.get(groupRegionKey); + } + if (regionStrs != null && !regionStrs.trim().equals("")) { + String[] regionStrArr = regionStrs.split(";"); + for (String str : regionStrArr) { + if (str != null && !str.trim().equals("")) { - String regionStr = getRegionInfo(str); - if (regionStr != null - && !regionStr.trim().equals("")) { - String[] regionKeyArr = regionStr.split(";"); - if (regionKeyArr != null - && regionKeyArr.length > 0) { - // 根据分组与域关联关系找到对应域配置然后删除(重命名) - removeRegionConfig(maatXmlConfig, - regionKeyArr, maatVersion, service, - transaction, redisDBIndex, isStart); + String regionStr = getRegionInfo(str); + if (regionStr != null + && !regionStr.trim().equals("")) { + String[] regionKeyArr = regionStr + .split(";"); + if (regionKeyArr != null + && regionKeyArr.length > 0) { + // 根据分组与域关联关系找到对应域配置然后删除(重命名) + removeRegionConfig(maatXmlConfig, + regionKeyArr, maatVersion, + service, transaction, + redisDBIndex, isStart); + } + } else { + throw new ServiceRuntimeException("从" + + idRelaRedisDBIndex + + "号redis库中无法获取MAAT配置分组与域的关联关系，key为" + + groupRegionKey, + RestBusinessCode.KeyNotExistsInRedis + .getValue()); } - } else { - throw new ServiceRuntimeException("从" - + idRelaRedisDBIndex - + "号redis库中无法获取MAAT配置分组与域的关联关系，key为" - + groupRegionKey, - RestBusinessCode.KeyNotExistsInRedis - .getValue()); } } } @@ -1348,7 +1321,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 编译配置用于实时统计 取消分类性质,标签等信息 + * 取消实时统计库中的编译配置 + * + * @return */ private boolean removeStatisticsReal(Map> map, Transaction transaction, Boolean isStart) { if (map != null && map.size() > 0) { @@ -1411,11 +1386,16 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 删除配置成功后,需要更新编译,组,域等配置id的对应关系 + * 失效或生效配置后,更新编译,组,域等配置id的对应关系 * - * @param idMap + * @param map redisdb与编译id的对应 + * @param transaction + * @param isStart 是否将配置置为生效 + * @param compileGroupMap 将配置置为失效时,需要保留哪些组(一般针对分组复用的配置,保留当前组,下次可以重复利用改组及其下的域) + * @return */ - private boolean removeMaatRelation(Map> map, Transaction transaction, Boolean isStart) { + private boolean removeMaatRelation(Map> map, Transaction transaction, Boolean isStart, + Map> compileGroupMap) { if (map != null && map.size() > 0) { int idRelaRedisDBIndex = Configurations.getIntProperty("idRelaRedisDBIndex", 15); transaction.select(idRelaRedisDBIndex); @@ -1423,6 +1403,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { List idList = map.get(service); if (idList != null && idList.size() > 0) { for (Long compileId : idList) { + + List keepGroupIdList = compileGroupMap.get(compileId); + String compileStr = "COMPILEGROUP:" + compileId; String compileStrVal = JedisUtils.get(compileStr, idRelaRedisDBIndex);// 根据编译id获取该编译下的分组关系 if (compileStrVal != null && !compileStrVal.trim().equals("")) { @@ -1468,10 +1451,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { try { // 为了提高效率,不判断了,如果报错直接捕捉异常处理 // 删除分组与域的关联关系 - if (isStart == null) {// 删除 - transaction.del(groupRegion); - } else if (isStart) {// 将失效置为生效 - + if (isStart) {// 将失效置为生效 groupRegionVal = groupRegionVal .replace("OBSOLETE_RULE", "EFFECTIVE_RULE"); String[] split = org.apache.commons.lang.StringUtils @@ -1495,29 +1475,35 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { groupRegionVal); } } else {// 将生效变为失效 - groupRegionVal = groupRegionVal - .replace("EFFECTIVE_RULE", "OBSOLETE_RULE"); - String[] split = org.apache.commons.lang.StringUtils - .split(groupRegionVal, ";"); - if (split.length > 1) { - Set set = new HashSet<>(); + long groupId = Long.parseLong( + groupRegion.replace("GROUPREGION:", "")); - for (String regionKeyStr : split) { - if (regionKeyStr != null && !regionKeyStr - .trim().equals("")) { - set.add(regionKeyStr); + if (!keepGroupIdList.contains(groupId)) { + groupRegionVal = groupRegionVal.replace( + "EFFECTIVE_RULE", "OBSOLETE_RULE"); + String[] split = org.apache.commons.lang.StringUtils + .split(groupRegionVal, ";"); + if (split.length > 1) { + Set set = new HashSet<>(); + + for (String regionKeyStr : split) { + if (regionKeyStr != null + && !regionKeyStr.trim() + .equals("")) { + set.add(regionKeyStr); + } } - } - StringBuffer sb = new StringBuffer(); - for (String regionKeyStr : set) { - sb.append(";"); - sb.append(regionKeyStr); - } - transaction.set(groupRegion, sb.toString());// 避免有多个重复的region-key + StringBuffer sb = new StringBuffer(); + for (String regionKeyStr : set) { + sb.append(";"); + sb.append(regionKeyStr); + } + transaction.set(groupRegion, sb.toString());// 避免有多个重复的region-key - } else { - transaction.set(groupRegion.toUpperCase(), - groupRegionVal); + } else { + transaction.set(groupRegion.toUpperCase(), + groupRegionVal); + } } } @@ -1840,7 +1826,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { * 如果没有被使用则先存储在临时库里面,后面下发编译时使用到了该分组再把该分组下的所有域复制到编译下面 */ @Override - public boolean saveGroupReuseConfig(List configList) { + public boolean updateGroupRegion(List configList) { Jedis resource = JedisUtils.getResource(0); Transaction transaction = resource.multi(); try { @@ -1945,83 +1931,136 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } /** - * 保存域配置信息,供分组复用单独添加域和普通maat配置添加域 + * 保存域配置信息,如果当前域所属的组是公共组则需要向所有的redisdb中下发域配置,否则只向指定的组下发 * - * @param maatConfig 配置信息 - * @param maatXmlConfig 配置的表达式 - * @param maatVersion 版本号 - * @param service 业务类型 - * @param transaction redis连接 - * @param redisDBIndex redis编号 - * @param isReuseSaveRegion 是否是分组复用单独添加域配置 + * @param maatConfig 配置信息 + * @param maatXmlConfig 配置的表达式 + * @param maatVersion 版本号 + * @param service 业务类型 + * @param transaction redis连接 + * @param redisDBIndex redis编号 + * @param isCommonGroup 是否是公共组,如果是公共组则需要向所有的db下发 */ private Integer addRegion(MaatConfig maatConfig, MaatXmlConfig maatXmlConfig, Double maatVersion, int service, - Transaction transaction, Integer redisDBIndex, boolean isReuseSaveRegion) { - - Boolean serviceIsReuse = ServiceAndRDBIndexReal.serviceIsReuse(service); - + Transaction transaction, Integer redisDBIndex, List commonGroupIdList) { +// Boolean serviceIsReuse = ServiceAndRDBIndexReal.serviceIsReuse(service); int count = 0;// 计算下所有的域是不是都没有值,如果没有值则给出提示 List> ipRegionMapList = maatConfig.getIpRegionMapList(); if (ipRegionMapList != null && ipRegionMapList.size() > 0) { count += ipRegionMapList.size(); for (Map map : ipRegionMapList) { - setCommonConfig(maatXmlConfig, map, 12, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 12代表是ip类域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 12, maatVersion, service, transaction, Integer.parseInt(db), + null);// 12代表是ip类域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 12, maatVersion, service, transaction, redisDBIndex, null);// 12代表是ip类域配置 + } } } List> numRegionMapList = maatConfig.getNumRegionMapList(); if (numRegionMapList != null && numRegionMapList.size() > 0) { count += numRegionMapList.size(); for (Map map : numRegionMapList) { - setCommonConfig(maatXmlConfig, map, 13, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 13代表是数值类配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 13, maatVersion, service, transaction, Integer.parseInt(db), + null);// 13代表是数值类配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 13, maatVersion, service, transaction, redisDBIndex, null);// 13代表是数值类配置 + } } } List> strRegionMapList = maatConfig.getStrRegionMapList(); if (strRegionMapList != null && strRegionMapList.size() > 0) { count += strRegionMapList.size(); for (Map map : strRegionMapList) { - setCommonConfig(maatXmlConfig, map, 14, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 14代表是字符串类域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 14, maatVersion, service, transaction, Integer.parseInt(db), + null);// 14代表是字符串类域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 14, maatVersion, service, transaction, redisDBIndex, null);// 14代表是字符串类域配置 + } } } List> strStrRegionMapList = maatConfig.getStrStrRegionMapList(); if (strStrRegionMapList != null && strStrRegionMapList.size() > 0) { count += strStrRegionMapList.size(); for (Map map : strStrRegionMapList) { - setCommonConfig(maatXmlConfig, map, 15, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 15代表是增强字符串类域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 15, maatVersion, service, transaction, Integer.parseInt(db), + null);// 15代表是增强字符串类域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 15, maatVersion, service, transaction, redisDBIndex, null);// 15代表是增强字符串类域配置 + } } } List> fileDigestRegionMapList = maatConfig.getFileDigestRegionMapList(); if (fileDigestRegionMapList != null && fileDigestRegionMapList.size() > 0) { count += fileDigestRegionMapList.size(); for (Map map : fileDigestRegionMapList) { - setCommonConfig(maatXmlConfig, map, 16, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 16代表是文件摘要类域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 16, maatVersion, service, transaction, Integer.parseInt(db), + null);// 16代表是文件摘要类域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 16, maatVersion, service, transaction, redisDBIndex, null);// 16代表是文件摘要类域配置 + } } } List> fileLikeRegionMapList = maatConfig.getFileLikeRegionMapList(); if (fileLikeRegionMapList != null && fileLikeRegionMapList.size() > 0) { count += fileLikeRegionMapList.size(); for (Map map : fileLikeRegionMapList) { - setCommonConfig(maatXmlConfig, map, 17, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 17代表是文本相似性域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 17, maatVersion, service, transaction, Integer.parseInt(db), + null);// 17代表是文本相似性域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 17, maatVersion, service, transaction, redisDBIndex, null);// 17代表是文本相似性域配置 + } } } List> ipclientList = maatConfig.getIpClientRangeMapList(); if (ipclientList != null && ipclientList.size() > 0) { count += ipclientList.size(); for (Map map : ipclientList) { - setCommonConfig(maatXmlConfig, map, 18, maatVersion, service, transaction, redisDBIndex, null, - serviceIsReuse);// 18代表是区域ip域配置 + Long groupId = Long.parseLong(map.get("group_id")); + boolean isCommonGroup = commonGroupIdList.contains(groupId); + if (isCommonGroup) { + for (String db : Constants.COMMONGROUPDBARR) { + setCommonConfig(maatXmlConfig, map, 18, maatVersion, service, transaction, Integer.parseInt(db), + null);// 18代表是区域ip域配置 + } + } else { + setCommonConfig(maatXmlConfig, map, 18, maatVersion, service, transaction, redisDBIndex, null);// 18代表是区域ip域配置 + } } } - - if (count == 0 && isReuseSaveRegion) { - throw new ServiceRuntimeException("添加分组复用域配置时,所有的域配置都为空,请检查配置参数是否正确", - RestBusinessCode.ConfigSourceIsNull.getValue()); - } +// if (count == 0 && isReuseSaveRegion) { +// throw new ServiceRuntimeException("添加分组复用域配置时,所有的域配置都为空,请检查配置参数是否正确", +// RestBusinessCode.ConfigSourceIsNull.getValue()); +// } return count; } diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java index 46244c6..eaa2084 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java @@ -34,17 +34,19 @@ public interface ConfigRedisService { * 保存 maat配置接口,key是redisDBIndex,value是配置集合 * * @param configMap + * @param configMap * @return 成功返回true,失败返回false或抛出异常 */ - public boolean saveMaatConfig(Map> configMap); + public boolean saveMaatConfig(Map> configMap,List commonGroupIdList); /** - * 分组复用域配置新增接口,value是配置集合 + * 该接口用途:界面对某个组下面的域配置进行修改,因为界面没有保存regionid,所以无法准确的去修改某个域配置,因此界面每次都会传过来该组下所有的region,后台根据groupid先将老的region删除,然后在将新的region添加到对应的redisdb中 + * ,value是配置集合 * * @param configList * @return 成功返回true,失败返回false或抛出异常 */ - public boolean saveGroupReuseConfig(List configList); + public boolean updateGroupRegion(List configList); /** * 获取指定key的自增长值 @@ -73,13 +75,15 @@ public interface ConfigRedisService { public boolean delUnMaatConfig(Map>> idMap, boolean isInvalid); /** - * 删除maat类配置,key是业务类型,value是配置id集合 + * 删除maat类配置,key是业务类型,value是配置id集合,并保存某些不需要删除的group(其实是保存region),方便下次下发配置时可以直接使用这些region * * @param serviceConfigMap - * @param isStart 是否置为生效, + * @param isStart 是否置为生效, + * @param compileGroupMap 在将配置置为失效时,需要保留的groupid,key是compileid,value是groupid集合 * @return 成功返回true,失败返回false或抛出异常 */ - public boolean delMaatConfig(Map> serviceConfigMap,boolean isStart); + public boolean delMaatConfig(Map> serviceConfigMap, boolean isStart, + Map> compileGroupMap); /** * 删除分组复用的域配置 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 6730f4e..8c55c53 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -8,9 +8,11 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -22,7 +24,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.nis.domain.restful.CommonSourceFieldCfg; import com.nis.domain.restful.ConfigCompile; -import com.nis.domain.restful.ConfigCompileStartStop; import com.nis.domain.restful.ConfigGroupRelation; import com.nis.domain.restful.DigestRegion; import com.nis.domain.restful.GroupReuse; @@ -124,7 +125,7 @@ public class ConfigSourcesService extends BaseService { StringBuffer sb) throws Exception { Map> maatMap = new HashMap>(); Map> configMap = new HashMap>(); - + Set commonGroupIdSet = new HashSet<>(); for (ConfigCompile configCompile : configCompileList) { Integer service = Integer.valueOf(configCompile.getService().toString()); MaatConfig maatConfig = new MaatConfig(); @@ -139,6 +140,9 @@ public class ConfigSourcesService extends BaseService { dstMaplList = new ArrayList>(); for (ConfigGroupRelation group : configCompile.getGroupRelationList()) { dstMaplList.add(convertObjectToMap(group, ConfigGroupRelation.class)); + if (group.getIsCommonGroup() != null && group.getIsCommonGroup() == 1) { + commonGroupIdSet.add(group.getGroupId()); + } } } maatConfig.setGroupMapList(dstMaplList); @@ -337,15 +341,17 @@ public class ConfigSourcesService extends BaseService { } public void updateConfigSources(AuditLogThread thread, long start, List compileList, Date opTime, - StringBuffer sb, boolean isConfigStartStop) throws Exception { + StringBuffer sb) throws Exception { // 所有状态更新的配置isValid的值必须相同 Map validIdMap = new HashMap(); - + // 在将配置置为失效时,记录需要保留的groupid(哪些组及组下的域不用置为失效) + Map> compileGroupMap = new HashMap>(); Map> compileMap = new HashMap>(); if (null != compileList && compileList.size() > 0) { for (ConfigCompile config : compileList) { - checkCompileOptForUpdate(config, isConfigStartStop); - validIdMap.put(config.getIsValid().toString(), config.getIsValid().toString()); + checkCompileOptForUpdate(config); + Integer isValid = config.getIsValid(); + validIdMap.put(isValid.toString(), isValid.toString()); if (config.getOpTime() == null) { config.setOpTime(opTime); } @@ -357,8 +363,21 @@ public class ConfigSourcesService extends BaseService { idList.add(config.getCompileId()); compileMap.put(config.getService(), idList); } + if (isValid == 0) { + List keepGroupIdList = config.getKeepGroupIdList(); + if (keepGroupIdList != null && keepGroupIdList.size() > 0) { + for (ConfigGroupRelation group : keepGroupIdList) { + if (compileGroupMap.containsKey(config.getCompileId())) { + compileGroupMap.get(config.getCompileId()).add(group.getGroupId()); + } else { + List groupIdList = new ArrayList(); + groupIdList.add(group.getGroupId()); + compileGroupMap.put(config.getCompileId(), groupIdList); + } + } + } + } } - } else { throw new RestServiceException("编译配置不能为空" + sb.toString(), RestBusinessCode.CompileIsNull.getValue()); } @@ -368,24 +387,24 @@ public class ConfigSourcesService extends BaseService { RestBusinessCode.IsValidNonUniq.getValue()); } - if (!isConfigStartStop) { - // 所有的都删除成功返回true - if (!configRedisService.delMaatConfig(compileMap,false)) { - throw new ServiceRuntimeException("取消MAAT配置时出现异常，具体原因不详，请联系管理员", - RestBusinessCode.service_runtime_error.getValue()); - } - } else { - boolean isStart = true;// 置为生效 - Integer isValid = compileList.get(0).getIsValid(); - if (isValid == 0) { - isStart = false;// 置为失效 - } - if (!configRedisService.delMaatConfig(compileMap, isStart)) { - throw new ServiceRuntimeException("停启用MAAT配置时出现异常，具体原因不详，请联系管理员", - RestBusinessCode.service_runtime_error.getValue()); - } - +// if (!isConfigStartStop) { + // 所有的都删除成功返回true +// if (!configRedisService.delMaatConfig(compileMap,false)) { +// throw new ServiceRuntimeException("取消MAAT配置时出现异常，具体原因不详，请联系管理员", +// RestBusinessCode.service_runtime_error.getValue()); +// } +// } else { + boolean isStart = true;// 置为生效 + Integer isValid = compileList.get(0).getIsValid(); + if (isValid == 0) { + isStart = false;// 置为失效 } + if (!configRedisService.delMaatConfig(compileMap, isStart, compileGroupMap)) { + throw new ServiceRuntimeException("停启用,或取消MAAT配置时出现异常，具体原因不详，请联系管理员", + RestBusinessCode.service_runtime_error.getValue()); + } + +// } } private String convertToTimeStamp16(Date date) { @@ -401,7 +420,7 @@ public class ConfigSourcesService extends BaseService { * @param config * @return */ - private void checkCompileOptForUpdate(ConfigCompile config, boolean isConfigStartStop) throws Exception { + private void checkCompileOptForUpdate(ConfigCompile config) throws Exception { if (StringUtil.isEmpty(config.getCompileId())) { throw new RestServiceException(RestBusinessCode.CompileIdIsNull.getErrorReason(), @@ -411,16 +430,14 @@ public class ConfigSourcesService extends BaseService { throw new RestServiceException(RestBusinessCode.ServiceIsNull.getErrorReason(), RestBusinessCode.ServiceIsNull.getValue()); } - if (StringUtil.isEmpty(config.getIsValid())) { + Integer isValid = config.getIsValid(); + if (StringUtil.isEmpty(isValid)) { throw new RestServiceException("编译配置id为" + config.getCompileId() + "的IsValid字段不能为空", RestBusinessCode.IsValidIsNull.getValue()); } - - if (!isConfigStartStop) { - if (config.getIsValid() != 0) { - throw new RestServiceException("编译配置id为" + config.getCompileId() + "的配置在修改时不能为有效", - RestBusinessCode.IsValidIsF.getValue()); - } + if (isValid == 1 && (config.getKeepGroupIdList() != null && config.getKeepGroupIdList().size() > 0)) { + throw new RestServiceException("编译配置id为" + config.getCompileId() + "的配置在将状态改为生效时keepGroupIdList必须为空", + RestBusinessCode.GroupidShouldNull.getValue()); } } @@ -896,7 +913,7 @@ public class ConfigSourcesService extends BaseService { // 调用接口入redis logger.info("---------------调用Redis 分组复用配置新增接口---------------------"); - configRedisService.saveGroupReuseConfig(list); + configRedisService.updateGroupRegion(list); // configRedisService.saveGroupReuseConfigByPipeLine(list); }