From 6957e6dc28c25f1492dea8116055c32ef9620613 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 13:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/BadgeController.java | 16 ------- .../epmet/controller/UserBadgeController.java | 17 ++++++- .../controller/UserBaseInfoController.java | 2 +- .../java/com/epmet/service/BadgeService.java | 16 ++----- .../com/epmet/service/UserBadgeService.java | 19 ++++++-- .../epmet/service/UserBaseInfoService.java | 13 +++++- .../epmet/service/impl/BadgeServiceImpl.java | 31 ------------- .../service/impl/UserBadgeServiceImpl.java | 44 +++++++++++++++---- .../service/impl/UserBaseInfoServiceImpl.java | 32 +++++++++++--- 9 files changed, 109 insertions(+), 81 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index 5841af3353..f4e2c3feee 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -176,20 +176,4 @@ public class BadgeController { public Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList) { return new Result>().ok(badgeService.queryGridAuditingBadgeCount(gridIdList)); } - - /** - * desc: 党员认证通过后，添加党员 徽章记录 - * - * @param tokenDto - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @author LiuJanJun - * @date 2020/11/18 10:28 上午 - */ - @PostMapping("adduserpartybadgerecord") - public Result audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - badgeService.addUserPartyBadgeRecord(tokenDto, formDTO); - return new Result(); - } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java index a901d9202f..42a8b17015 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java @@ -107,9 +107,24 @@ public class UserBadgeController { * @date 2020/11/4 5:47 下午 */ @PostMapping("openedorclosed") - public Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO){ + public Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO) { userBadgeService.openedOrClosed(openedOrClosedFormDTO); return new Result(); } + /** + * desc: 党员认证通过后，添加党员 徽章记录 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author LiuJanJun + * @date 2020/11/18 10:28 上午 + */ + @PostMapping("adduserpartybadgerecord") + public Result audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + Boolean aBoolean = userBadgeService.addUserPartyBadgeRecord(tokenDto, formDTO); + return new Result().ok(aBoolean); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index d8d9d969f3..128b27a7e9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -110,7 +110,7 @@ public class UserBaseInfoController { **/ @PostMapping("queryuserbaseinfo") public Result> queryUserBaseInfo(@RequestBody List userIdList) { - List list = userBaseInfoService.queryUserBaseInfo(userIdList); + List list = userBaseInfoService.queryUserBaseInfoFromCache(userIdList); return new Result>().ok(list); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index c62354b135..b409d5709b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -21,7 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.BadgeDTO; -import com.epmet.dto.form.*; +import com.epmet.dto.form.AddBadgeFormDTO; +import com.epmet.dto.form.BadgeAuditFormDTO; +import com.epmet.dto.form.BadgeFormDTO; +import com.epmet.dto.form.EditBadgeFormDTO; import com.epmet.dto.result.*; import com.epmet.entity.BadgeEntity; @@ -184,15 +187,4 @@ public interface BadgeService extends BaseService { * @Date 2020/11/12 15:56 **/ List queryGridAuditingBadgeCount(List gridIdList); - - /** - * desc: 添加用户党员徽章记录 - * - * @param tokenDto - * @param formDTO - * @return java.lang.Boolean - * @author LiuJanJun - * @date 2020/11/18 10:32 上午 - */ - Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java index a905bb2f9b..2c189d7072 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java @@ -90,12 +90,23 @@ public interface UserBadgeService { List getUserSortedBadge(String userId,String customerId); /** - * @Description 批量获取用户显示徽章 * @param customerId * @param userIds - * @return java.util.Map> + * @return java.util.Map> + * @Description 批量获取用户显示徽章 * @author wangc * @date 2020.11.10 15:12 - */ - Map> getBatchUserSortedBadge(String customerId, List userIds); + */ + Map> getBatchUserSortedBadge(String customerId, List userIds); + + /** + * desc: 添加用户党员徽章记录 + * + * @param tokenDto + * @param formDTO + * @return java.lang.Boolean + * @author LiuJanJun + * @date 2020/11/18 10:32 上午 + */ + Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index bf5cf90e67..2aeac53ce9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -101,13 +101,22 @@ public interface UserBaseInfoService extends BaseService { void delete(String[] ids); /** - * @return java.util.List + * @param userId + * @return com.epmet.dto.result.UserBaseInfoResultDTO + * @author yinzuomei + * @description 先从缓存获取 缓存没有获取db + * @Date 2020/11/18 19:35 + **/ + UserBaseInfoResultDTO queryUserBaseInfoFromCache(String userId); + + /** * @param userIdList + * @return java.util.List * @author yinzuomei * @description 传入用户id集合，返回用户的基本信息（包含微信基本信息） * @Date 2020/7/22 9:35 **/ - List queryUserBaseInfo(List userIdList); + List queryUserBaseInfoFromCache(List userIdList); /** * @return void 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 6bcf4a1b93..01ee9463d0 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 @@ -45,7 +45,6 @@ import com.epmet.entity.BadgeEntity; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.MessageFeignClient; import com.epmet.redis.UserBadgeRedis; -import com.epmet.redis.UserBaseInfoRedis; import com.epmet.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -80,8 +79,6 @@ public class BadgeServiceImpl extends BaseServiceImpl imp private MessageFeignClient messageFeignClient; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; - @Autowired - private UserBaseInfoRedis userBaseInfoRedis; @Override @@ -428,32 +425,4 @@ public class BadgeServiceImpl extends BaseServiceImpl imp return baseDao.queryGridAuditingBadgeCount(gridIdList); } - /** - * desc: 添加用户党员徽章记录 - * - * @param tokenDto - * @param formDTO - * @return java.lang.Boolean - * @author LiuJanJun - * @date 2020/11/18 10:32 上午 - */ - @Override - public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) { - String badgeId = baseDao.getPartyBadgeId(tokenDto.getCustomerId()); - ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO(); - resiUserBadgeDTO.setCustomerId(tokenDto.getCustomerId()); - resiUserBadgeDTO.setBadgeId(badgeId); - UserBaseInfoResultDTO userInfo = userBaseInfoRedis.getUserInfo(formDTO.getUserId()); - if (userInfo == null) { - log.error("获取用户信息失败"); - return false; - } - resiUserBadgeDTO.setGridId(userInfo.getRegisteredGridId()); - resiUserBadgeDTO.setUserId(formDTO.getUserId()); - resiUserBadgeDTO.setIsOpened(NumConstant.ONE); - resiUserBadgeDTO.setCertificationAutidStatus(BadgeConstant.APPROVED); - resiUserBadgeService.save(resiUserBadgeDTO); - return true; - } - } \ No newline at end of file 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 8599ebe0a6..896474ef15 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 @@ -14,6 +14,7 @@ import com.epmet.dao.BadgeDao; import com.epmet.dao.ResiUserBadgeDao; import com.epmet.dao.UserBadgeDao; import com.epmet.dao.UserRoleDao; +import com.epmet.dto.ResiUserBadgeDTO; import com.epmet.dto.UserBadgeCertificateRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -28,10 +29,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -157,7 +155,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { UserBadgeCertificateRecordDTO form = ConvertUtils.sourceToTarget(certificationAddFormDTO, UserBadgeCertificateRecordDTO.class); List userIds = new ArrayList<>(); userIds.add(certificationAddFormDTO.getUserId()); - List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds); + List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfoFromCache(userIds); if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){ throw new RenException("查询用户基本信息集合为空......"); } @@ -310,15 +308,43 @@ public class UserBadgeServiceImpl implements UserBadgeService { * @Description 批量获取用户显示徽章 * @param customerId * @param userIds - * @return java.util.Map> + * @return java.util.Map> * @author wangc * @date 2020.11.10 15:12 */ @Override public Map> getBatchUserSortedBadge(String customerId, List userIds) { - List badges = userBadgeDao.selectBatchUserSortedBadge(customerId,userIds); - if(CollectionUtils.isEmpty(badges)) return Collections.EMPTY_MAP; - return badges.stream().collect(Collectors.groupingBy(UserBadgeInfoResultDTO :: getUserId)); + List badges = userBadgeDao.selectBatchUserSortedBadge(customerId, userIds); + if (CollectionUtils.isEmpty(badges)) return Collections.EMPTY_MAP; + return badges.stream().collect(Collectors.groupingBy(UserBadgeInfoResultDTO::getUserId)); + } + + /** + * desc: 添加用户党员徽章记录 + * + * @param tokenDto + * @param formDTO + * @return java.lang.Boolean + * @author LiuJanJun + * @date 2020/11/18 10:32 上午 + */ + @Override + public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) { + String badgeId = badgeDao.getPartyBadgeId(tokenDto.getCustomerId()); + ResiUserBadgeDTO resiUserBadgeDTO = new ResiUserBadgeDTO(); + resiUserBadgeDTO.setCustomerId(tokenDto.getCustomerId()); + resiUserBadgeDTO.setBadgeId(badgeId); + UserBaseInfoResultDTO userInfo = userBaseInfoService.queryUserBaseInfoFromCache(formDTO.getUserId()); + if (userInfo == null) { + log.error("获取用户信息失败"); + return false; + } + resiUserBadgeDTO.setGridId(userInfo.getRegisteredGridId()); + resiUserBadgeDTO.setUserId(formDTO.getUserId()); + resiUserBadgeDTO.setIsOpened(NumConstant.ONE); + resiUserBadgeDTO.setCertificationAutidStatus(BadgeConstant.APPROVED); + resiUserBadgeDao.insertResiUserBadge(Arrays.asList(resiUserBadgeDTO)); + return true; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 326e74912d..0552968911 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -46,6 +47,7 @@ import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.*; @@ -127,6 +129,26 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl + * @author yinzuomei + * @description 传入用户id集合，返回用户的基本信息（包含微信基本信息） + * @Date 2020/7/22 9:35 + **/ + @Override + public UserBaseInfoResultDTO queryUserBaseInfoFromCache(String userId) { + if (StringUtils.isBlank(userId)) { + throw new RenException("用户Id不能为空"); + } + List userBaseInfoResultDTOS = this.queryUserBaseInfoFromCache(Arrays.asList(userId)); + if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)) { + logger.warn("queryUserBaseInfo return empty,userId:{}", userId); + return null; + } + return userBaseInfoResultDTOS.get(0); + } + /** * @param userIdList * @return java.util.List @@ -135,11 +157,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl queryUserBaseInfo(List userIdList) { - if(null==userIdList||userIdList.size()<1){ + public List queryUserBaseInfoFromCache(List userIdList) { + if (null == userIdList || userIdList.size() < 1) { return new ArrayList<>(); } - List userBaseInfoList=new ArrayList<>(); + List userBaseInfoList = new ArrayList<>(); /* for(String userId:userIdList){ UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId); if(null!=userBaseInfoResultDTO){ @@ -152,7 +174,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp(); + List userWechatDTOList = userWechatDao.selectNotInUserBaseInfoTemp(); List userIdList=new ArrayList<>(); for(UserWechatDTO userWechatDTO:userWechatDTOList){ userIdList.add(userWechatDTO.getUserId());