From 3624ee5f180389c88de8c9b770e54c3320634ff2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Nov 2020 10:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mine/dto/result/OperListResultDTO.java | 5 +++++ .../com/epmet/constant/BadgeConstant.java | 2 ++ .../dto/result/UserOperListResultDTO.java | 5 +++++ .../java/com/epmet/redis/UserBadgeRedis.java | 20 +++++++++++++++---- .../service/impl/UserBadgeServiceImpl.java | 8 ++++---- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java index 044d118a0f..d202918818 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java @@ -43,4 +43,9 @@ public class OperListResultDTO implements Serializable { */ private Boolean isReject; + /** + * 徽章类型：党员徽章；party，无：none + */ + private String badgeType; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java index 57661b4871..73c82eaa00 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/constant/BadgeConstant.java @@ -22,4 +22,6 @@ public interface BadgeConstant { String NONE ="none"; + String SMS_CODE_KEY = "epmet:smsCode:badge:"; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java index 4e587fa5cd..89f3f98aba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java @@ -44,6 +44,11 @@ public class UserOperListResultDTO implements Serializable { */ private Boolean isReject; + /** + * 徽章类型：党员徽章；party，无：none + */ + private String badgeType; + @JsonIgnore private String customerId; @JsonIgnore 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 cf1a34f871..5bc394a6ec 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 @@ -27,7 +27,7 @@ public class UserBadgeRedis { * @author zxc * @date 2020/11/3 2:50 下午 */ - public Object getUserBadge(String customerId){ + public Object getCustomerBadge(String customerId){ Object userBadge = redisUtils.hGet(BadgeConstant.BADGE_KEY + customerId, BadgeConstant.BADGE); return userBadge; } @@ -39,17 +39,29 @@ public class UserBadgeRedis { * @author zxc * @date 2020/11/3 2:51 下午 */ - public void setUserBadge(List userBadge,String customerId){ + public void setCustomerBadge(List userBadge, String customerId){ redisUtils.hSet(BadgeConstant.BADGE_KEY+customerId,BadgeConstant.BADGE, JSON.toJSON(userBadge).toString(),-1); } + /** + * @Description 存放徽章审核 手机验证码 + * @Param mobile + * @author zxc + * @date 2020/11/5 10:30 上午 + */ public void saveBadgeSmsCode(String mobile, String smsCode) { - String smsCodeKey = "epmet:smsCode:badge:" + mobile; + String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile; redisUtils.set(smsCodeKey, smsCode, MINUTE_THIRTY_EXPIRE); } + /** + * @Description 获取徽章审核 手机验证码 + * @Param mobile + * @author zxc + * @date 2020/11/5 10:30 上午 + */ public String getBadgeSmsCode(String mobile) { - String smsCodeKey = "epmet:smsCode:badge:" + mobile; + String smsCodeKey = BadgeConstant.SMS_CODE_KEY + mobile; String smsCode = (String) redisUtils.get(smsCodeKey); return smsCode; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 4ecb78f7a9..33a4d0a922 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -56,7 +56,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { */ @Override public List selectBadgeList(UserBadgeListFormDTO userBadgeListFormDTO) { - Object userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId()); + Object userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); if (null == userBadge){ List resultUserBadge = new ArrayList<>(); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(userBadgeListFormDTO); @@ -71,8 +71,8 @@ public class UserBadgeServiceImpl implements UserBadgeService { } }); }); - userBadgeRedis.setUserBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId()); - userBadge = userBadgeRedis.getUserBadge(userBadgeListFormDTO.getCustomerId()); + userBadgeRedis.setCustomerBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId()); + userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); } } List redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class); @@ -105,7 +105,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { @Override public List selectOperList(UserOperListFormDTO userOperListFormDTO) { List userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId()); - Object userBadge = userBadgeRedis.getUserBadge(userOperListFormDTO.getCustomerId()); + Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId()); List userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class); // 没有任何记录 if (CollectionUtils.isEmpty(userAuthBadgeList)){