diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index db65ca6e0d..19d8e73374 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -189,7 +189,7 @@ public class RedisUtils { T target = clazz.newInstance(); BeanUtils.copyProperties(o, target); return target; - }catch (Exception e){throw new RenException("convert error");}finally{throw new RenException("convert error");} + }catch (Exception e){throw new RenException("convert error");} }).collect(Collectors.toList()); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java index 599beea58f..46f5ad1fa2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java @@ -32,5 +32,5 @@ public class UserRedisKeys { * @date 2020.11.05 13:34 */ public static String getResiUserBadgeKey(String customerId,String userId){ - return rootPrefix.concat("badge:user:").concat(customerId).concat(userId);} + return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat(userId);} } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java index da4eecfd5b..dcac2a8d9b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java @@ -101,9 +101,9 @@ public class UserBadgeRedis { * @author wangc * @date 2020.11.05 13:26 */ - public List obtainUserBadge2List(String userId) { + public List obtainUserBadge2List(String userId,String customerId) { //TODO 补偿 - return redisUtils.lrange(UserRedisKeys.getResiUserKey(userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class); + return redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class); } /** @@ -115,7 +115,7 @@ public class UserBadgeRedis { * @date 2020.11.05 13:37 */ public long pushOrRemoveUserBadge4List(String userId, String badgeId, String customerId) { - List orient = obtainUserBadge2List(userId); + List orient = obtainUserBadge2List(userId,customerId); UserBadgeUnitFormDTO unit = null; if (!CollectionUtils.isEmpty(orient)) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index 4f461457f8..36ea72d2ff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -333,7 +333,7 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Override public void testCache() { badgeRedis.pushOrRemoveUserBadge4List("test-wc","1","45687aa479955f9d06204d415238f7cc"); - List cache = badgeRedis.obtainUserBadge2List("test-wc"); + List cache = badgeRedis.obtainUserBadge2List("test-wc","45687aa479955f9d06204d415238f7cc"); System.out.println(cache); }