From 351354d56dcabea45c876a96ca69fa8b302e65bd Mon Sep 17 00:00:00 2001
From: RenKaiGe-Office <RenKaiGe-Office@renkaige-office>
Date: Sat, 2 Jun 2018 12:49:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=E6=88=90=E5=8A=9F=E6=97=B6return=20?=
 =?UTF-8?q?true=E7=9A=84=E8=BF=94=E5=9B=9E=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../restful/ConfigRedisServiceimpl.java       | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java
index b93627e..705a636 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java
@@ -35,6 +35,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 	@Transactional
 	public boolean saveUnMaatConfig(Map<Integer, List<Map<String, String>>> configMap) {
 		if (configMap != null && configMap.size() > 0) {
+			int count = 0;
 			for (Integer redisDBIndex : configMap.keySet()) {
 				if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) {
 					RedisTemplate<String, String> redisTemplate = SpringContextHolder
@@ -132,14 +133,16 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 								}
 							}
 						}
-
+						redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
+						logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
+								Integer.valueOf(maatVersionStr) + 1);
+						count++;
 					}
-					redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
-					logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
-							Integer.valueOf(maatVersionStr) + 1);
-					return true;
 				}
 			}
+			if (count == configMap.size()) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -203,6 +206,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 	@Transactional
 	public boolean saveMaatConfig(Map<Integer, List<MaatConfig>> configMap) {
 		if (configMap != null && configMap.size() > 0) {
+			int count = 0;
 			for (Integer redisDBIndex : configMap.keySet()) {
 				if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) {
 					RedisTemplate<String, String> redisTemplate = SpringContextHolder
@@ -223,13 +227,16 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 							redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
 							logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
 									Integer.valueOf(maatVersionStr) + 1);
-							return true;
+							count++;
 						}
 
 					}
 
 				}
 			}
+			if (count == configMap.size()) {
+				return true;
+			}
 		}
 		return false;
 
@@ -408,6 +415,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 	@Transactional
 	public boolean delUnMaatConfig(Map<Integer, Map<Integer, List<Long>>> idMap) {
 		if (idMap != null && idMap.size() > 0) {
+			int count = 0;
 			for (Integer redisDBIndex : idMap.keySet()) {
 				RedisTemplate<String, String> redisTemplate = SpringContextHolder
 						.getBean("redisTemplate" + redisDBIndex);
@@ -500,17 +508,20 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 										}
 									}
 								}
+								redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
+								logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
+										Integer.valueOf(maatVersionStr) + 1);
+								count++;
 							}
 						}
-						redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
-						logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
-								Integer.valueOf(maatVersionStr) + 1);
-						return true;
+
 					}
 				}
 
 			}
-
+			if (count == idMap.size()) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -519,6 +530,7 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 	@Transactional
 	public boolean delMaatConfig(Map<Integer, Map<Integer, List<Long>>> idMap) {
 		if (idMap != null && idMap.size() > 0) {
+			int count = 0;
 			for (Integer redisDBIndex : idMap.keySet()) {
 				RedisTemplate<String, String> redisTemplate = SpringContextHolder
 						.getBean("redisTemplate" + redisDBIndex);
@@ -541,11 +553,14 @@ public class ConfigRedisServiceimpl implements ConfigRedisService {
 							redisTemplate.boundValueOps("MAAT_VERSION").increment(1l);
 							logger.info("向{}号redis数据库更新了MAAT_VERSION,更新后版本是{}", redisDBIndex,
 									Integer.valueOf(maatVersionStr) + 1);
-							return true;
+							count++;
 						}
 					}
 				}
 			}
+			if (count == idMap.size()) {
+				return true;
+			}
 		}
 		return false;
 	}