From d3b02c1c830a7badc5ebb7d9cb43ed0c4027fe81 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Nov 2020 14:30:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/constant/BadgeConstant.java | 2 +- .../src/main/resources/mapper/UserBadgeDao.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 73c82eaa00..315bf66a30 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 @@ -6,7 +6,7 @@ package com.epmet.constant; */ public interface BadgeConstant { - String BADGE_KEY = "epmet:badge:"; + String BADGE_KEY = "epmet:badge:customer:"; String BADGE = "badge"; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 436898cc61..1b4e6a0c78 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -34,6 +34,7 @@ AND b.DEL_FLAG = 0 AND ub.CERTIFICATION_AUTID_STATUS = 'pass' AND b.CUSTOMER_ID = 'default' + AND b.BADGE_STATUS = 'online' AND ub.USER_ID = #{userId} ORDER BY ub.UPDATED_TIME DESC @@ -49,7 +50,8 @@ FROM badge WHERE DEL_FLAG = '0' - AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = 'zxc') + AND (CUSTOMER_ID = 'default' OR CUSTOMER_ID = #{customerId}) + AND BADGE_STATUS = 'online' From c34e6a619c0dc11b7c5fe686bcdf27bde23e5304 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Nov 2020 14:46:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserBadgeServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 33a4d0a922..f7ed9f2266 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 @@ -64,15 +64,20 @@ public class UserBadgeServiceImpl implements UserBadgeService { Map> groupByCustomer = userBadgeListResultDTOS.stream().collect(Collectors.groupingBy(UserBadgeListResultDTO::getCustomerId)); resultUserBadge.addAll(groupByCustomer.get(BadgeConstant.DEFAULT_CUSTOMER)); List badgeByCustomer = groupByCustomer.get(userBadgeListFormDTO.getCustomerId()); - resultUserBadge.forEach(r -> { - badgeByCustomer.forEach(b -> { - if (r.getBadgeId().equals(b.getBadgeId())){ - BeanUtils.copyProperties(b,r); - } + if (!CollectionUtils.isEmpty(badgeByCustomer)) { + resultUserBadge.forEach(r -> { + badgeByCustomer.forEach(b -> { + if (r.getBadgeId().equals(b.getBadgeId())) { + BeanUtils.copyProperties(b, r); + } + }); }); - }); - userBadgeRedis.setCustomerBadge(resultUserBadge,userBadgeListFormDTO.getCustomerId()); - userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); + userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId()); + userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); + }else { + userBadgeRedis.setCustomerBadge(resultUserBadge, userBadgeListFormDTO.getCustomerId()); + userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); + } } } List redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class); From 2171e513f845e5366e8e26f98839e3958db229e6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 5 Nov 2020 14:53:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/CertificationDetailResultDTO.java | 5 +++++ .../src/main/resources/mapper/UserBadgeDao.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java index 4e7298c1b9..2120fe7fb0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java @@ -57,4 +57,9 @@ public class CertificationDetailResultDTO implements Serializable { * 驳回原因 */ private String authReason; + + /** + * 审核记录ID + */ + private String recordId; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml index 1b4e6a0c78..022d95e7f8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml @@ -94,7 +94,8 @@ CERTIFICATION_IMG, AUDIT_STATUS, AUDIT_STATUS AS authResult, - AUDIT_REMARK AS authReason + AUDIT_REMARK AS authReason, + ID AS recordId FROM user_badge_certificate_record WHERE