From 660ba23c78f979f68f37b661a6f689fd2db4eceb Mon Sep 17 00:00:00 2001 From: renkaige Date: Mon, 14 Jan 2019 20:13:51 +0600 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=8F=96=E6=B6=88maat=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=AF=B9=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=BB=84=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../restful/ConfigJedisServiceimpl.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) 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 bf03307..1662339 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -1760,17 +1760,22 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { regionVal = keyMap.get(groupRegionStr); } - String[] commonsplit = org.apache.commons.lang.StringUtils.split(regionVal, ";"); - for (String regionKey : commonsplit) { - String maatKey = regionKey.substring(0, regionKey.indexOf("-")); - for (String db : Constants.COMMONGROUPDBARR) { - int everyDb = Integer.parseInt(db); - transaction.select(everyDb); - String obsoleteKey = maatKey.replace("EFFECTIVE_RULE", "OBSOLETE_RULE"); - transaction.rename(maatKey, obsoleteKey); - Double maatVersion = dbVersionMap.get(everyDb); - updateMaatInfo(expressionList, obsoleteKey, transaction, maatVersion, everyDb, true); + if (regionVal != null && !regionVal.trim().equals("")) { + String[] commonsplit = org.apache.commons.lang.StringUtils.split(regionVal, ";"); + for (String regionKey : commonsplit) { + String maatKey = regionKey.substring(0, regionKey.indexOf("-")); + for (String db : Constants.COMMONGROUPDBARR) { + int everyDb = Integer.parseInt(db); + transaction.select(everyDb); + String obsoleteKey = maatKey.replace("EFFECTIVE_RULE", "OBSOLETE_RULE"); + transaction.rename(maatKey, obsoleteKey); + Double maatVersion = dbVersionMap.get(everyDb); + updateMaatInfo(expressionList, obsoleteKey, transaction, maatVersion, everyDb, true); + } } + }else { + throw new ServiceRuntimeException("修改公共组域配置时,无法获取到groupid="+groupId+"的公共组,请检查配置参数是否正确", + RestBusinessCode.ConfigSourceIsNull.getValue()); } }