From 8a798d6d030df710597e765a217451f00f7b9fb7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 9 Nov 2020 11:18:19 +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 --- .../com/epmet/constant/BadgeConstant.java | 12 +++++++ .../main/java/com/epmet/dao/UserBadgeDao.java | 9 ++++++ .../service/impl/UserBadgeServiceImpl.java | 31 ++++++++++++++++--- .../main/resources/mapper/UserBadgeDao.xml | 22 +++++++++++++ 4 files changed, 70 insertions(+), 4 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 f8b6dcc2e5..131e4a9203 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 @@ -30,4 +30,16 @@ public interface BadgeConstant { String OFFLINE ="offline"; + String RESI = "resi"; + + String AUTH_TITLE = "您有一条认证消息"; + + String GET_BADGE_NAME_FAILURE = "获取徽章名称失败......"; + + String MESSAGE_CONTENT = "您好，您的%s因认证失败未成功点亮，请查看"; + + String READ_FLAG = "unread"; + + String DEFAULT = "default"; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java index 65910f22cd..aae79a6ac3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java @@ -36,6 +36,15 @@ public interface UserBadgeDao { */ List selectAllBadge(@Param("customerId") String customerId); + /** + * @Description 查询单个徽章信息 + * @Param customerId + * @Param badgeId + * @author zxc + * @date 2020/11/9 11:17 上午 + */ + UserBadgeListResultDTO selectBadgeByBadgeId(@Param("customerId") String customerId,@Param("badgeId") String badgeId); + /** * @Description 查询徽章认证记录 * @Param userId 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 2f3f51ed86..95c2810750 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 @@ -20,7 +20,6 @@ import com.epmet.service.UserBadgeService; import com.epmet.service.UserBaseInfoService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,8 +27,6 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @Author zxc @@ -47,6 +44,8 @@ public class UserBadgeServiceImpl implements UserBadgeService { private UserBaseInfoService userBaseInfoService; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private EpmetMessageOpenFeignClient messageFeignClient; /** * @Description 查询已经点亮的徽章 @@ -151,9 +150,32 @@ public class UserBadgeServiceImpl implements UserBadgeService { form.setCertificationImg(certificationAddFormDTO.getCertificationImg()); form.setSurname(certificationAddFormDTO.getSurname()); userBadgeDao.insertUserBadgeCertificateRecord(form); + + //TODO 站内信发送 您好，您的xxx徽章因认证失败未成功点亮，请查看 + + return new Result(); } + public void sendMessageByUser(UserBadgeCertificateRecordDTO form){ + List msgList = new ArrayList<>(); + UserMessageFormDTO formDTO = new UserMessageFormDTO(); + formDTO.setApp(BadgeConstant.RESI); + formDTO.setCustomerId(form.getCustomerId()); + formDTO.setGridId(form.getGridId()); + UserBadgeListResultDTO userBadgeListResultDTO = userBadgeDao.selectBadgeByBadgeId(form.getCustomerId(), form.getBadgeId()); + if (null == userBadgeListResultDTO){ + log.error(BadgeConstant.GET_BADGE_NAME_FAILURE); + return; + } + formDTO.setMessageContent(String.format(BadgeConstant.MESSAGE_CONTENT,userBadgeListResultDTO.getBadgeName())); + formDTO.setTitle(BadgeConstant.AUTH_TITLE); + formDTO.setReadFlag(BadgeConstant.READ_FLAG); + formDTO.setUserId(form.getUserId()); + msgList.add(formDTO); + Result result = messageFeignClient.saveUserMessageList(msgList); + } + /** * @Description 发送验证码 * @Param badgeSendCodeFormDTO @@ -205,7 +227,8 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List authField(AuthFieldFormDTO authFieldFormDTO) { List authFieldResultDTOS = userBadgeDao.selectAuthField(authFieldFormDTO); if (CollectionUtils.isEmpty(authFieldResultDTOS)){ - return new ArrayList<>(); + authFieldFormDTO.setCustomerId(BadgeConstant.DEFAULT); + return userBadgeDao.selectAuthField(authFieldFormDTO); } return authFieldResultDTOS; } 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 a20a9c0e61..c62269205f 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 @@ -126,6 +126,28 @@ AND cc.BADGE_ID = #{badgeId} ORDER BY cf.SORT +