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>> configMap) { if (configMap != null && configMap.size() > 0) { + int count = 0; for (Integer redisDBIndex : configMap.keySet()) { if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { RedisTemplate 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> configMap) { if (configMap != null && configMap.size() > 0) { + int count = 0; for (Integer redisDBIndex : configMap.keySet()) { if (redisDBIndex >= 0 && redisDBIndex < Configurations.getIntProperty("maxRedisDBIndex", 6)) { RedisTemplate 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>> idMap) { if (idMap != null && idMap.size() > 0) { + int count = 0; for (Integer redisDBIndex : idMap.keySet()) { RedisTemplate 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>> idMap) { if (idMap != null && idMap.size() > 0) { + int count = 0; for (Integer redisDBIndex : idMap.keySet()) { RedisTemplate 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; }