From 5a54c3f9c2489db7a94fe4cc395381ddd95203e8 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Sat, 8 Sep 2018 17:53:34 +0800 Subject: [PATCH] =?UTF-8?q?1:=E8=A7=A3=E5=86=B3maat=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=BB=84=E8=A3=85=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202:=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=9F=9F=E9=85=8D=E7=BD=AE,=E6=9F=90=E4=BA=9B=E5=9F=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/MaatTestController.java | 16 +++++---- .../restful/ConfigJedisServiceimpl.java | 34 +++++++++++-------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/nis/web/controller/restful/MaatTestController.java b/src/main/java/com/nis/web/controller/restful/MaatTestController.java index fef63f5..19ca65d 100644 --- a/src/main/java/com/nis/web/controller/restful/MaatTestController.java +++ b/src/main/java/com/nis/web/controller/restful/MaatTestController.java @@ -258,11 +258,11 @@ public class MaatTestController { List numList = new ArrayList(); List strList = new ArrayList(); List digestList = new ArrayList(); - configCompile.setIpRegionList(ipList); - configCompile.setNumRegionList(numList); - configCompile.setStrRegionList(strList); - configCompile.setDigestRegionList(digestList); - configCompile.setIpClientRangeList(ipList); +// configCompile.setIpRegionList(ipList); +// configCompile.setNumRegionList(numList); +// configCompile.setStrRegionList(strList); +// configCompile.setDigestRegionList(digestList); +// configCompile.setIpClientRangeList(ipList); if (tableType == 12 || tableType == 18) { ipList = new ArrayList(); if (tableNameArr.length == 1) { @@ -379,7 +379,11 @@ public class MaatTestController { strRegion.setGroupId(groupId); strRegion.setRegionId(configRedisService.getIncrId("SEQ_REGIONID")); strRegion.setTableName(ServiceAndRDBIndexReal.getMaatTableName(service, type, tableName)); - strRegion.setDistrict(""); + if(type==15) { + strRegion.setDistrict("增强字符串测试groupid"+groupId); + }else { + strRegion.setDistrict(""); + } strRegion.setKeywords("keywords,UUID:" + UUID.randomUUID()); strRegion.setExprType(1); strRegion.setMatchMethod(1); 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 2b4ecf4..19cd307 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -526,7 +526,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { "无法从参数中获取" + redisDBIndex + "号redis库,业务类型为:" + service + "的编译配置信息,请检查配置参数是否正确", RestBusinessCode.NotFoundCompileInfo.getValue()); } - boolean isReuse =false; + boolean isReuse = false; /** * 保存域配置信息 */ @@ -687,7 +687,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } } } - } else if (isReuse && (type == 12 || type == 13 || type == 14)) {// 将数据往临时库复制一份,无论临时库里有没有都可以直接写,有则覆盖,不影响 + } 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()); @@ -1048,20 +1048,24 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { // 如果只有一个编译id且与上面的编译id相同则说明未被分组复用,可以将其下的所有域置失效,否则不处理域配置,只把编译,分组关系置为无效 if (compileId.equals(compileStr)) {// String groupRegionKey = groupId.replace("GROUPCOMPILE", "GROUPREGION");// groupregion里面value是region的信息,key是group的信息,所以可以直接将GROUPCOMPILE替换为GROUPREGION - String regionStr = getRegionInfo( - JedisUtils.get(groupRegionKey, idRelaRedisDBIndex)); - if (regionStr != null && !regionStr.trim().equals("")) { - String[] regionKeyArr = regionStr.split(";"); - if (regionKeyArr != null && regionKeyArr.length > 0) { - // 根据分组与域关联关系找到对应域配置然后删除(重命名) - removeRegionConfig(maatXmlConfig, regionKeyArr, maatVersion, - service, transaction, redisDBIndex); + String regionStrs = JedisUtils.get(groupRegionKey, idRelaRedisDBIndex); + if (regionStrs != null && !regionStrs.trim().equals("")) { + String[] regionStrArr = regionStrs.split(";"); + for (String str : regionStrArr) { + 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); + } + } else { + throw new ServiceRuntimeException("从" + idRelaRedisDBIndex + + "号redis库中无法获取MAAT配置分组与域的关联关系，key为" + groupRegionKey, + RestBusinessCode.KeyNotExistsInRedis.getValue()); + } } - } else { - throw new ServiceRuntimeException( - "从" + idRelaRedisDBIndex + "号redis库中无法获取MAAT配置分组与域的关联关系，key为" - + groupRegionKey, - RestBusinessCode.KeyNotExistsInRedis.getValue()); } } }