diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 163287e..e47c6cd 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -64,7 +64,7 @@ public class ConfigSourcesController extends BaseRestController { if (type == 1) { Map map = new HashMap(); Integer service = 98; - long id = configRedisService.getIncrId("seq_compileid", service); + long id = configRedisService.getIncrId("seq_compileid"); // int id=2; map.put("cfg_id", id + ""); map.put("is_valid", "1"); @@ -75,12 +75,12 @@ public class ConfigSourcesController extends BaseRestController { map.put("file_id", id + ""); map.put("service", service + ""); listMap.add(map); - configRedisService.saveUnMaatConfig(listMap,service); + configRedisService.saveUnMaatConfig(listMap, service); } else { Integer service = 100; Map map = new HashMap(); - long id = configRedisService.getIncrId("seq_compileid", service); + long id = configRedisService.getIncrId("seq_compileid"); // int id=2; map.put("cfg_id", id + ""); map.put("is_valid", "1"); @@ -89,7 +89,7 @@ public class ConfigSourcesController extends BaseRestController { map.put("level", "20"); listMap.add(map); map.put("service", service + ""); - configRedisService.saveUnMaatConfig(listMap,service); + configRedisService.saveUnMaatConfig(listMap, service); } return "ok"; } catch (Exception e) { @@ -106,7 +106,7 @@ public class ConfigSourcesController extends BaseRestController { List listMap = new ArrayList(); listMap.add(getMaatConfig(service)); listMap.add(getMaatConfig(service)); - configRedisService.saveMaatConfig(listMap,service); + configRedisService.saveMaatConfig(listMap, service); // new ConfigRedisServiceimpl().GETMaatConfig(listMap); return "ok"; } catch (Exception e) { @@ -118,9 +118,9 @@ public class ConfigSourcesController extends BaseRestController { public MaatConfig getMaatConfig(Integer service) { String time = new Date().getTime() + ""; Map configMap = new HashMap(); - long seq_compileid = configRedisService.getIncrId("SEQ_COMPILEID", service); - long seq_groupid = configRedisService.getIncrId("SEQ_GROUPID", service); - long seq_regionid = configRedisService.getIncrId("SEQ_REGIONID", service); + long seq_compileid = configRedisService.getIncrId("SEQ_COMPILEID"); + long seq_groupid = configRedisService.getIncrId("SEQ_GROUPID"); + long seq_regionid = configRedisService.getIncrId("SEQ_REGIONID"); // int id=2; configMap.put("cfg_id", seq_compileid + ""); configMap.put("service", service + ""); diff --git a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java index 49d4e02..9880366 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisService.java @@ -34,5 +34,5 @@ public interface ConfigRedisService { * @param key 需要自增的key * @return */ - public Long getIncrId(String key, int service); + public Long getIncrId(String key); } 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 e619d7b..9a8302c 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigRedisServiceimpl.java @@ -289,8 +289,8 @@ public class ConfigRedisServiceimpl extends BaseRedisDao impleme } } - public Long getIncrId(String key, int service) { - DynamicJedisDataBase.setRedisDataBase(getRedisDBByService(service), redisTemplate); + public Long getIncrId(String key) { + //DynamicJedisDataBase.setRedisDataBase(getRedisDBByService(service), redisTemplate); // RedisAtomicLong atomicLong = new RedisAtomicLong(key, // redisTemplate.getConnectionFactory()); //