From dc5a444412fa809deb01544d2c66628845c1d5b7 Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@nismail.iie.ac.cn>
Date: Tue, 16 Oct 2018 19:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E7=8B=AC=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9F=9F=E9=85=8D=E7=BD=AE=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=BAapp=E5=8D=8F=E8=AE=AEip=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0userregion=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/service/restful/ConfigJedisServiceimpl.java | 13 +++++++++----
 .../web/service/restful/ConfigSourcesService.java   |  2 ++
 2 files changed, 11 insertions(+), 4 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 f64e4a2..b16d753 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
@@ -1445,7 +1445,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 	}
 
 	private void addTmpReion(List<Map<String, String>> regionMapList, MaatXmlConfig maatXmlConfig,
-			Transaction transaction, int type, int tmpStorageReuseRegionDB, int idRelaRedisDBIndex) {
+			Transaction transaction, int type, int tmpStorageReuseRegionDB, int idRelaRedisDBIndex, int service) {
 		if (regionMapList != null && regionMapList.size() > 0) {
 			for (Map<String, String> map : regionMapList) {
 				List<MaatXmlExpr> expressionList = maatXmlConfig.getExpressionList();
@@ -1488,6 +1488,10 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 						for (String valStr : valSplit) {
 							if (!StringUtils.isEmpty(valStr) && valStr.trim().startsWith("[")) {
 								valStr = valStr.trim().replace("[", "").replace("]", "");
+								if (valStr.toLowerCase().equals("op_time") && type == 12) {
+									String user_region = map.get("user_region");
+									valBF.append(user_region + "\t");
+								}
 								String val = map.get(valStr);
 								if (val != null) {
 									valBF.append(val);
@@ -1500,6 +1504,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 											"未从map中获取到" + valStr + "的值,无法拼接redisValue,请检查数据或配置文件是否正确",
 											RestBusinessCode.NotFoundValueByKey.getValue());
 								}
+
 							} else if (valStr.equals("&nbsp")) {
 								valBF.append(" ");
 							} else if (valStr.equals("\\t")) {// xml中是字符串的\t这里判断的时候需要转义为\\t,但是添加的时候需要添加\t不是\\t
@@ -1580,11 +1585,11 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
 				for (MaatConfig maatConfig : configList) {
 					MaatXmlConfig maatXmlConfig = ReadMaatXmlUtil.getMaatConfigByService(37);// maat类配置的表达式都一样,这里因为没有service所以就随便取了一个
 					addTmpReion(maatConfig.getIpRegionMapList(), maatXmlConfig, transaction, 12,
-							tmpStorageReuseRegionDB, idRelaRedisDBIndex);
+							tmpStorageReuseRegionDB, idRelaRedisDBIndex, maatConfig.getService());
 					addTmpReion(maatConfig.getNumRegionMapList(), maatXmlConfig, transaction, 13,
-							tmpStorageReuseRegionDB, idRelaRedisDBIndex);
+							tmpStorageReuseRegionDB, idRelaRedisDBIndex, maatConfig.getService());
 					addTmpReion(maatConfig.getStrRegionMapList(), maatXmlConfig, transaction, 14,
-							tmpStorageReuseRegionDB, idRelaRedisDBIndex);
+							tmpStorageReuseRegionDB, idRelaRedisDBIndex, maatConfig.getService());
 				}
 			} else {
 				throw new ServiceRuntimeException("添加分组复用域配置时,未发现对应的配置信息,请检查配置参数是否正确",
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 02a46a9..45f4740 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
@@ -862,8 +862,10 @@ public class ConfigSourcesService extends BaseService {
 			} else {
 				maatConfig.getIpRegionMapList().addAll(dstMapList);
 			}
+			maatConfig.setService(groupReuse.getService());
 			list.add(maatConfig);
 		}
+	
 		// 调用接口入redis
 		logger.info("---------------调用Redis 分组复用配置新增接口---------------------");
 		configRedisService.saveGroupReuseConfig(list);