From 04d993d90ccc4e8710f67cebe580ddd27b91a76d Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 13:36:53 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BE=BD=E7=AB=A0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/BadgeServiceImpl.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) 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 a0b24549e3..6bcf4a1b93 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,6 +45,7 @@ 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; @@ -78,8 +79,9 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Autowired private MessageFeignClient messageFeignClient; @Autowired - private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; - + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private UserBaseInfoRedis userBaseInfoRedis; @Override @@ -438,7 +440,20 @@ public class BadgeServiceImpl extends BaseServiceImpl imp @Override public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) { String badgeId = baseDao.getPartyBadgeId(tokenDto.getCustomerId()); - return null; + 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 From 8be9aa78c186003484fa7e075e9306903e9d5b39 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 18 Nov 2020 13:50:48 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartyMemberUserIdsResultDTO.java | 19 +++++++ .../java/com/epmet/dao/ResiUserBadgeDao.java | 15 +++++- .../main/java/com/epmet/dao/UserRoleDao.java | 8 +++ .../service/impl/UserBadgeServiceImpl.java | 33 ++++++++---- .../src/main/resources/mapper/BadgeDao.xml | 1 + .../resources/mapper/ResiUserBadgeDao.xml | 52 +++++++++++++------ .../main/resources/mapper/UserBadgeDao.xml | 10 ++-- .../src/main/resources/mapper/UserRoleDao.xml | 11 ++++ 8 files changed, 118 insertions(+), 31 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java new file mode 100644 index 0000000000..1e6d3e050e --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/11/18 下午1:47 + */ +@Data +public class PartyMemberUserIdsResultDTO implements Serializable { + + private static final long serialVersionUID = -6932505684417996587L; + + private String userId; + + private Boolean reStatus; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java index 0448b16cee..e58e8a72f0 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.ResiUserBadgeDTO; import com.epmet.entity.ResiUserBadgeEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 用户徽章关系表 @@ -29,5 +33,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiUserBadgeDao extends BaseDao { - + + /** + * @Description 初始化党员徽章插入 + * @Param userIds + * @Param badgeId + * @author zxc + * @date 2020/11/18 上午10:56 + */ + void insertResiUserBadge(@Param("badges")List badges); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index 3801f0fcf4..106be55a1c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -72,4 +72,12 @@ public interface UserRoleDao extends BaseDao { * @Description 居民端-查询用户角色key列表 **/ List selectUserRoleKeyList(GetRoleKeyListFormDTO formDTO); + + /** + * @Description 查询所有党员UserId + * @Param + * @author zxc + * @date 2020/11/18 上午10:50 + */ + List selectPartyMemberUserIds(); } 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 3386d421e8..8599ebe0a6 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 @@ -10,7 +10,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.PhoneValidatorUtils; import com.epmet.constant.BadgeConstant; import com.epmet.constant.SmsTemplateConstant; +import com.epmet.dao.BadgeDao; +import com.epmet.dao.ResiUserBadgeDao; import com.epmet.dao.UserBadgeDao; +import com.epmet.dao.UserRoleDao; import com.epmet.dto.UserBadgeCertificateRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -49,6 +52,12 @@ public class UserBadgeServiceImpl implements UserBadgeService { private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired private EpmetMessageOpenFeignClient messageFeignClient; + @Autowired + private UserRoleDao userRoleDao; + @Autowired + private ResiUserBadgeDao resiUserBadgeDao; + @Autowired + private BadgeDao badgeDao; /** * @Description 查询已经点亮的徽章 @@ -104,27 +113,31 @@ public class UserBadgeServiceImpl implements UserBadgeService { }); return userOperListResultDTOS; } - List badgeIsOpenedList = userBadgeDao.selectBadgeByUserId(userOperListFormDTO.getUserId()); userOperListResultDTOS.forEach(ub -> { userAuthBadgeList.forEach(u -> { if (ub.getBadgeId().equals(u.getBadgeId())){ ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED) ? true : false); ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO); + ub.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES); } }); - if (CollectionUtils.isEmpty(badgeIsOpenedList)){ - ub.setIsLighted(BadgeConstant.NO); - }else { - badgeIsOpenedList.forEach(b -> { - if (ub.getBadgeId().equals(b.getBadgeId())){ - ub.setIsLighted(b.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES); - } - }); - } }); return userOperListResultDTOS; } + public void initPartyMemberBadge(){ + List userIds = userRoleDao.selectPartyMemberUserIds(); + if (CollectionUtils.isEmpty(userIds)){ + return; + } + List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds); + if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){ + log.error("未查询到党员基本信息......"); + throw new RenException("未查询到党员基本信息......"); + } +// badgeDao.getPartyBadgeId() + } + /** * @Description 个人中心-提交徽章认证 * @Param certificationAddFormDTO diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index faf3ef9c00..6325b139ff 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -276,6 +276,7 @@ WHERE DEL_FLAG = '0' AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default') + AND FIXATION_BADGE_TYPE = 'party' order by CREATED_TIME desc LIMIT 1 \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml index 221c9c3d3f..cf38780a58 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml @@ -3,21 +3,43 @@ - - - - - - - - - - - - - - - + + + INSERT INTO resi_user_badge + ( + ID, + CUSTOMER_ID, + GRID_ID, + USER_ID, + BADGE_ID, + IS_OPENED, + CERTIFICATION_AUTID_STATUS, + DEL_FLAG, + REVISION, + CREATED_BY, + CREATED_TIME, + UPDATED_BY, + UPDATED_TIME + ) + VALUES + + ( + REPLACE(UUID(),'-',''), + #{b.customerId}, + #{b.gridId}, + #{b.userId}, + #{b.badgeId}, + #{b.isOpened}, + #{b.certificationAutidStatus}, + #{b.delFlag}, + #{b.revision}, + #{b.createdBy}, + NOW(), + #{b.updatedBy}, + NOW(), + ) + + \ No newline at end of file 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 8377839e72..3709525bb5 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 @@ -64,12 +64,12 @@ SELECT CUSTOMER_ID, BADGE_ID, - CERTIFICATION_IMG, - AUDIT_STATUS - FROM user_badge_certificate_record + CERTIFICATION_AUTID_STATUS AS auditStatus, + IS_OPENED + FROM resi_user_badge WHERE DEL_FLAG = 0 - AND IS_LAST = 'yes' - AND USER_ID = #{userId} + AND CERTIFICATION_AUTID_STATUS = 'approved' + AND USER_ID = #{userId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index d7726d3b7b..4f99f7a43c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -100,4 +100,15 @@ AND ur.user_id = #{userId} AND ( ur.grid_id = #{gridId} OR ur.grid_id = 'all' ) + + + From 6957e6dc28c25f1492dea8116055c32ef9620613 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 13:56:20 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B7=BB=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()); From a23e25cb7c703256d6ff8f4da85ee6618aed357f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 14:51:14 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=20=E6=B7=BB=E5=8A=A0=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=BE=BD=E7=AB=A0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 17 +++++++++++++++- .../epmet/feign/EpmetUserOpenFeignClient.java | 20 +++++++++++++++---- .../EpmetUserOpenFeignClientFallback.java | 5 +++++ 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 5962ea22a2..0f0502b4cf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -23,7 +23,6 @@ import com.epmet.modules.feign.ResiGroupFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; -import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; import com.epmet.redis.ResiPartyMemberRedis; @@ -250,6 +249,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); //addby jianjun 2020-07-31 之前没有成功的返回结果 result = new Result<>().ok("注册成功"); + //添加党员徽章信息 + this.addUserPartyBadge(partyMemberInfoDTO.getUserId()); } //将自动认证结果存入党员认证自动审核表 @@ -351,6 +352,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId())); partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()); } + //在徽章记录表中添加 徽章记录 表明此时已经认证通过可以点亮徽章了 + addUserPartyBadge(partyMemberInfoEntity.getUserId()); } else { auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG); } @@ -359,6 +362,18 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return new Result(); } + private void addUserPartyBadge(String partyUserId) { + if (StringUtils.isBlank(partyUserId)) { + throw new RenException("addUserPartyBadge，用户Id不能为空"); + } + AddUserPartyBadgeFormDTO badgeFormDTO = new AddUserPartyBadgeFormDTO(); + badgeFormDTO.setUserId(partyUserId); + Result result = epmetUserOpenFeignClient.addUserPartyBadgeRecord(badgeFormDTO); + if (result == null || !result.success() || !result.getData()) { + throw new RenException("初始化党员徽章信息失败"); + } + } + @Override public Result auditingDetail(AuditingDetailFromDTO fromDTO) { AuditingDetailResultDTO resultDTO = new AuditingDetailResultDTO(); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 8655418acc..7b1bcdec24 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -10,7 +10,10 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -430,14 +433,23 @@ public interface EpmetUserOpenFeignClient { * @date 2020.11.10 15:59 */ @PostMapping("/epmetuser/badge/usershowbadge") - Result>> userShowBadge(@RequestBody UserGroupFormDTO param); + Result>> userShowBadge(@RequestBody UserGroupFormDTO param); /** * @param gridIdList * @author yinzuomei - * @description 根据网格id,查询每个网格有多少个徽章申请 + * @description 根据网格id, 查询每个网格有多少个徽章申请 * @Date 2020/11/12 15:41 **/ - @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount",consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount", consumes = MediaType.APPLICATION_JSON_VALUE) Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList); + + /** + * @param formDTO + * @author yinzuomei + * @description 党员认证成功后 添加userBadge记录到数据库 + * @Date 2020/11/12 15:41 + **/ + @PostMapping(value = "/epmetuser/more/badge/adduserpartybadgerecord") + Result addUserPartyBadgeRecord(@RequestBody AddUserPartyBadgeFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 1a1da3db60..5b40b4e68c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -311,4 +311,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> queryGridAuditingBadgeCount(List gridIdList) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryGridAuditingBadgeCount", gridIdList); } + + @Override + public Result addUserPartyBadgeRecord(AddUserPartyBadgeFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addUserPartyBadgeRecord", formDTO); + } } From 9876ac9b7d6003b3bcd133f75b91534045912f02 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Wed, 18 Nov 2020 15:14:17 +0800 Subject: [PATCH 05/11] =?UTF-8?q?advice=E4=BF=AE=E6=94=B9agency=5Fpids?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.8__alter_useradvice_pids.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.8__alter_useradvice_pids.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.8__alter_useradvice_pids.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.8__alter_useradvice_pids.sql new file mode 100644 index 0000000000..0c2dbc28b1 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.8__alter_useradvice_pids.sql @@ -0,0 +1,4 @@ +ALTER TABLE `user_advice` DROP COLUMN `AGENCY_PIDS`; + +ALTER TABLE `user_advice` +ADD COLUMN `AGENCY_PIDS` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `AGENCY_ID`; From c718e3a8698a22b608681cb295ee3dbe56237423 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 18 Nov 2020 15:16:20 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartyMemberUserIdsResultDTO.java | 4 + .../controller/UserBaseInfoController.java | 2 +- .../java/com/epmet/dao/ResiUserBadgeDao.java | 2 + .../main/java/com/epmet/dao/UserRoleDao.java | 3 +- .../com/epmet/service/UserBadgeService.java | 10 ++- .../epmet/service/UserBaseInfoService.java | 2 +- .../service/impl/UserBadgeServiceImpl.java | 88 ++++++++++++++++--- .../service/impl/UserBaseInfoServiceImpl.java | 4 +- .../src/main/resources/mapper/BadgeDao.xml | 5 ++ .../resources/mapper/ResiUserBadgeDao.xml | 8 +- .../src/main/resources/mapper/UserRoleDao.xml | 5 +- 11 files changed, 110 insertions(+), 23 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java index 1e6d3e050e..7bd50bea61 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberUserIdsResultDTO.java @@ -16,4 +16,8 @@ public class PartyMemberUserIdsResultDTO implements Serializable { private String userId; private Boolean reStatus; + + public PartyMemberUserIdsResultDTO() { + this.reStatus = false; + } } 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 128b27a7e9..d8d9d969f3 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.queryUserBaseInfoFromCache(userIdList); + List list = userBaseInfoService.queryUserBaseInfo(userIdList); return new Result>().ok(list); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java index e58e8a72f0..0ff7ee2c0d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/ResiUserBadgeDao.java @@ -43,4 +43,6 @@ public interface ResiUserBadgeDao extends BaseDao { */ void insertResiUserBadge(@Param("badges")List badges); + List selectUserIds(); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index 106be55a1c..a9d2f1bded 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.GetRoleKeyListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; +import com.epmet.dto.result.PartyMemberUserIdsResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import org.apache.ibatis.annotations.Mapper; @@ -79,5 +80,5 @@ public interface UserRoleDao extends BaseDao { * @author zxc * @date 2020/11/18 上午10:50 */ - List selectPartyMemberUserIds(); + List selectPartyMemberUserIds(); } 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 2c189d7072..142fa1b449 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 @@ -96,8 +96,16 @@ public interface UserBadgeService { * @Description 批量获取用户显示徽章 * @author wangc * @date 2020.11.10 15:12 + */ + Map> getBatchUserSortedBadge(String customerId, List userIds); + + /** + * @Description 初始化党员徽章 + * @Param userId + * @author zxc + * @date 2020/11/18 下午3:03 */ - Map> getBatchUserSortedBadge(String customerId, List userIds); + void initPartyMemberBadge(String userId); /** * desc: 添加用户党员徽章记录 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 2aeac53ce9..07acf1138b 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 @@ -116,7 +116,7 @@ public interface UserBaseInfoService extends BaseService { * @description 传入用户id集合，返回用户的基本信息（包含微信基本信息） * @Date 2020/7/22 9:35 **/ - List queryUserBaseInfoFromCache(List userIdList); + List queryUserBaseInfo(List userIdList); /** * @return void 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 896474ef15..83e2cf02c4 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 @@ -30,6 +30,11 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -123,17 +128,78 @@ public class UserBadgeServiceImpl implements UserBadgeService { return userOperListResultDTOS; } - public void initPartyMemberBadge(){ - List userIds = userRoleDao.selectPartyMemberUserIds(); - if (CollectionUtils.isEmpty(userIds)){ - return; - } - List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds); - if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){ - log.error("未查询到党员基本信息......"); - throw new RenException("未查询到党员基本信息......"); + /** + * @Description 初始化党员徽章 + * @Param userId + * @author zxc + * @date 2020/11/18 下午3:04 + */ + @Override + public void initPartyMemberBadge(String userId){ + List userIds = resiUserBadgeDao.selectUserIds(); + List badges = new ArrayList<>(); + String partyBadgeId = badgeDao.getPartyBadgeId(null); + if (StringUtils.isEmpty(userId)) { + List partyMemberUserIds = userRoleDao.selectPartyMemberUserIds(); + if (CollectionUtils.isEmpty(partyMemberUserIds)) { + return; + } + if (!CollectionUtils.isEmpty(userIds)) { + userIds.stream().forEach(u -> partyMemberUserIds.stream().filter(p -> u.equals(p.getUserId())).forEach(p -> p.setReStatus(true))); + } + List reUserIds = partyMemberUserIds.stream().filter(p -> !p.getReStatus()).map(p -> p.getUserId()).collect(Collectors.toList()); + List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(reUserIds); + if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)) { + log.error("未查询到党员基本信息......"); + throw new RenException("未查询到党员基本信息......"); + } + userBaseInfoResultDTOS.forEach(u -> { + ResiUserBadgeDTO dto = new ResiUserBadgeDTO(); + dto.setBadgeId(partyBadgeId); + dto.setCertificationAutidStatus("approved"); + dto.setCustomerId(u.getCustomerId()); + dto.setGridId(u.getRegisteredGridId()); + dto.setIsOpened(NumConstant.ZERO); + badges.add(dto); + }); + resiUserBadgeDao.insertResiUserBadge(badges); + }else { + List oneUserIds = new ArrayList<>(); + oneUserIds.add(userId); + List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(oneUserIds); + if (!CollectionUtils.isEmpty(userIds)) { + AtomicReference status = new AtomicReference<>(true); + userIds.forEach(u -> { + if(u.equals(userId)){ + status.set(false); + } + }); + if (status.get()==false){ + return; + }else { + userBaseInfoResultDTOS.forEach(u -> { + ResiUserBadgeDTO dto = new ResiUserBadgeDTO(); + dto.setBadgeId(partyBadgeId); + dto.setCertificationAutidStatus("approved"); + dto.setCustomerId(u.getCustomerId()); + dto.setGridId(u.getRegisteredGridId()); + dto.setIsOpened(NumConstant.ZERO); + badges.add(dto); + }); + } + }else { + userBaseInfoResultDTOS.forEach(u -> { + ResiUserBadgeDTO dto = new ResiUserBadgeDTO(); + dto.setBadgeId(partyBadgeId); + dto.setCertificationAutidStatus("approved"); + dto.setCustomerId(u.getCustomerId()); + dto.setGridId(u.getRegisteredGridId()); + dto.setIsOpened(NumConstant.ZERO); + badges.add(dto); + }); + } + resiUserBadgeDao.insertResiUserBadge(badges); } -// badgeDao.getPartyBadgeId() } /** @@ -155,7 +221,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { UserBadgeCertificateRecordDTO form = ConvertUtils.sourceToTarget(certificationAddFormDTO, UserBadgeCertificateRecordDTO.class); List userIds = new ArrayList<>(); userIds.add(certificationAddFormDTO.getUserId()); - List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfoFromCache(userIds); + List userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds); if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){ throw new RenException("查询用户基本信息集合为空......"); } 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 0552968911..7a961e6fd9 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 @@ -141,7 +141,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl userBaseInfoResultDTOS = this.queryUserBaseInfoFromCache(Arrays.asList(userId)); + List userBaseInfoResultDTOS = this.queryUserBaseInfo(Arrays.asList(userId)); if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)) { logger.warn("queryUserBaseInfo return empty,userId:{}", userId); return null; @@ -157,7 +157,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl queryUserBaseInfoFromCache(List userIdList) { + public List queryUserBaseInfo(List userIdList) { if (null == userIdList || userIdList.size() < 1) { return new ArrayList<>(); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 6325b139ff..3ca95c71d4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -275,7 +275,12 @@ badge WHERE DEL_FLAG = '0' + AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default') + + + AND CUSTOMER_ID = 'default' + AND FIXATION_BADGE_TYPE = 'party' order by CREATED_TIME desc LIMIT 1 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml index cf38780a58..82243c17cc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml @@ -16,9 +16,7 @@ CERTIFICATION_AUTID_STATUS, DEL_FLAG, REVISION, - CREATED_BY, CREATED_TIME, - UPDATED_BY, UPDATED_TIME ) VALUES @@ -33,13 +31,15 @@ #{b.certificationAutidStatus}, #{b.delFlag}, #{b.revision}, - #{b.createdBy}, NOW(), - #{b.updatedBy}, NOW(), ) + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 4f99f7a43c..4472c48b77 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -102,13 +102,14 @@ - SELECT ur.USER_ID FROM user_role ur - LEFT JOIN epmet_role er ON er.ID = ur.ROLE_ID + LEFT JOIN epmet_role er ON er.ID = ur.ROLE_ID WHERE ur.DEL_FLAG = 0 AND er.DEL_FLAG = 0 AND er.ROLE_KEY = 'partymember' + From 7d956831fc77bcfd23702408d958e8ae46c300e6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 18 Nov 2020 15:18:20 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/UserBadgeController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 42a8b17015..8b69857184 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 @@ -127,4 +127,16 @@ public class UserBadgeController { Boolean aBoolean = userBadgeService.addUserPartyBadgeRecord(tokenDto, formDTO); return new Result().ok(aBoolean); } + + /** + * @Description 初始化党员徽章 + * @Param userId + * @author zxc + * @date 2020/11/18 下午3:03 + */ + @PostMapping("initbadge") + public Result initPartyMemberBadge(){ + userBadgeService.initPartyMemberBadge(null); + return new Result(); + } } From 1866283d87f0587d896b1f3c7e319ba371ba19f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 18 Nov 2020 15:21:03 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9/epmetuser/userresiinfo?= =?UTF-8?q?/getuserresiinfolist=20=20=20/epmetuser/userresiinfo/getuserres?= =?UTF-8?q?iinfo=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/UserResiInfoResultDTO.java | 7 ++-- .../impl/RegisterRelationServiceImpl.java | 14 ++++++-- .../main/resources/mapper/UserResiInfoDao.xml | 35 +++++++++---------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java index 6bdc1f6d2f..c5482e05ba 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserResiInfoResultDTO.java @@ -12,11 +12,6 @@ import java.io.Serializable; @Data public class UserResiInfoResultDTO implements Serializable { - /** - * 唯一标识 - */ - private String id; - /** * 用户Id(主键) user.id */ @@ -61,4 +56,6 @@ public class UserResiInfoResultDTO implements Serializable { * 用户头像 */ private String headPhoto; + + private String nickName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 0cd383f980..67962815c1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -20,14 +20,17 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.constant.StrConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserCustomerConstant; import com.epmet.dao.*; -import com.epmet.dto.*; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; @@ -36,10 +39,10 @@ import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; import com.epmet.entity.UserWechatEntity; import com.epmet.feign.GovOrgFeignClient; -import com.epmet.redis.RegisterRelationRedis; import com.epmet.service.GridVisitedService; import com.epmet.service.RegisterRelationService; import com.epmet.util.ModuleConstant; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -243,6 +246,11 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl userWechatEntityList=userWechatDao.selectByUserId(enterGridFormDTO.getUserId()); + if(CollectionUtils.isNotEmpty(userWechatEntityList)){ + resultObj.setNickname(StringUtils.isNotBlank(userWechatEntityList.get(0).getNickname())?userWechatEntityList.get(0).getNickname(): StrConstant.EPMETY_STR); + resultObj.setUserHeadPhoto(StringUtils.isNotBlank(userWechatEntityList.get(0).getHeadImgUrl())?userWechatEntityList.get(0).getHeadImgUrl(): StrConstant.EPMETY_STR); + } } //3.获取权限 diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index c1f0edfce6..3e6adef055 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -66,7 +66,8 @@ ubi.SURNAME, ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) ) AS show_name, - ubi.HEAD_IMG_URL AS head_photo + ubi.HEAD_IMG_URL AS head_photo, + ubi.NICKNAME as nickName FROM user_base_info ubi LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' ) @@ -88,12 +89,10 @@ ) AS show_name FROM user_resi_info uri - LEFT JOIN user_wechat uw ON (uri.USER_ID = uw.USER_ID) + LEFT JOIN user_wechat uw ON (uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' AND uw.USER_ID = #{userId}) WHERE uri.DEL_FLAG = '0' - AND uw.DEL_FLAG = '0' AND uri.USER_ID = #{userId} - AND uw.USER_ID = #{userId} SELECT - uri.id, - uri.USER_ID, + ubi.USER_ID, uri.REG_MOBILE, - uri.SURNAME, - uri.`NAME`, - uri.STREET, - uri.DISTRICT, - uri.BUILDING_ADDRESS, + ubi.SURNAME, + ubi.`NAME`, + ubi.STREET, + ubi.DISTRICT, + ubi.BUILDING_ADDRESS, CONCAT( - uri.STREET, + ubi.STREET, '-', - uri.SURNAME, - ( CASE WHEN uri.GENDER = '1' THEN '先生' WHEN uri.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) + ubi.SURNAME, + ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END ) ) AS show_name, - uri.HEAD_IMG_URL as head_photo - FROM user_resi_info uri - WHERE uri.DEL_FLAG = '0' - AND uri.USER_ID in + ubi.HEAD_IMG_URL as head_photo + FROM user_base_info ubi + left join user_resi_info uri on(ubi.user_id=uri.user_id and uri.del_flag='0') + WHERE ubi.DEL_FLAG = '0' + AND ubi.USER_ID in #{userId} From d948ad0b39ebd9ecb6d855efc1455167094c2db5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 15:26:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E6=94=BE=E4=B8=AA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 9 +++--- .../epmet/feign/EpmetUserOpenFeignClient.java | 4 +-- .../EpmetUserOpenFeignClientFallback.java | 4 +-- .../epmet/controller/UserBadgeController.java | 22 ++------------ .../com/epmet/service/UserBadgeService.java | 13 +-------- .../service/impl/UserBadgeServiceImpl.java | 29 ------------------- 6 files changed, 13 insertions(+), 68 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 0f0502b4cf..7e3f5dd8c6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -281,6 +281,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService baseInfo.setName(partyMemberInfoDTO.getName()); epmetUserOpenFeignClient.saveUserBaseInfo(baseInfo); + return result; } @@ -347,10 +348,10 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService identityParam.setPartyFlag(NumConstant.ONE_STR); resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); //如果是自动匹配失败的，人工审核他是党员，需要记录党员库-居民的认证关系 - PartymemberConfirmAutoDTO partymemberConfirmAutoDTO=partymemberConfirmAutoService.get(fromDTO.getAutoId()); - if(partymemberConfirmAutoDTO!=null){ - log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s",partyMemberInfoEntity.getUserId(),partymemberConfirmAutoDTO.getPatryMemberBaseInfoId())); - partymemberAuthRecordService.insert(partyMemberInfoEntity,partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()); + PartymemberConfirmAutoDTO partymemberConfirmAutoDTO = partymemberConfirmAutoService.get(fromDTO.getAutoId()); + if (partymemberConfirmAutoDTO != null) { + log.info(String.format("自动匹配失败,人工审核是党员,保存partymember_auth_record,userId=%s,党员库id=%s", partyMemberInfoEntity.getUserId(), partymemberConfirmAutoDTO.getPatryMemberBaseInfoId())); + partymemberAuthRecordService.insert(partyMemberInfoEntity, partymemberConfirmAutoDTO.getPatryMemberBaseInfoId()); } //在徽章记录表中添加 徽章记录 表明此时已经认证通过可以点亮徽章了 addUserPartyBadge(partyMemberInfoEntity.getUserId()); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 7b1bcdec24..ea35e420c0 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -450,6 +450,6 @@ public interface EpmetUserOpenFeignClient { * @description 党员认证成功后 添加userBadge记录到数据库 * @Date 2020/11/12 15:41 **/ - @PostMapping(value = "/epmetuser/more/badge/adduserpartybadgerecord") - Result addUserPartyBadgeRecord(@RequestBody AddUserPartyBadgeFormDTO formDTO); + @PostMapping(value = "/epmetuser/more/badge/initbadge") + Result initBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 5b40b4e68c..2bbc2a83e4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -313,7 +313,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result addUserPartyBadgeRecord(AddUserPartyBadgeFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "addUserPartyBadgeRecord", formDTO); + public Result initBadge(AddUserPartyBadgeFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", formDTO); } } 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 8b69857184..7524ffa1be 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 @@ -113,30 +113,14 @@ public class UserBadgeController { } /** - * 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); - } - - /** - * @Description 初始化党员徽章 + * @Description 初始化党员徽章 或 党员认证通过后，添加党员 徽章记录 * @Param userId * @author zxc * @date 2020/11/18 下午3:03 */ @PostMapping("initbadge") - public Result initPartyMemberBadge(){ - userBadgeService.initPartyMemberBadge(null); + public Result initPartyMemberBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO) { + userBadgeService.initPartyMemberBadge(formDTO.getUserId()); return new Result(); } } 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 142fa1b449..08147de433 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 @@ -100,21 +100,10 @@ public interface UserBadgeService { Map> getBatchUserSortedBadge(String customerId, List userIds); /** - * @Description 初始化党员徽章 + * @Description 初始化党员徽章 或审核通过后 添加用户党员徽章记录 * @Param userId * @author zxc * @date 2020/11/18 下午3:03 */ void initPartyMemberBadge(String userId); - - /** - * 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/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 83e2cf02c4..ce39a81ebc 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 @@ -29,7 +29,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -385,32 +384,4 @@ public class UserBadgeServiceImpl implements UserBadgeService { 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; - } - } From f322f103157b4aac6a3bd5ab3c8cbac1ad041f08 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 15:31:19 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E6=94=BE=E4=B8=AA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 7e3f5dd8c6..31d670148a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -369,8 +369,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService } AddUserPartyBadgeFormDTO badgeFormDTO = new AddUserPartyBadgeFormDTO(); badgeFormDTO.setUserId(partyUserId); - Result result = epmetUserOpenFeignClient.addUserPartyBadgeRecord(badgeFormDTO); - if (result == null || !result.success() || !result.getData()) { + Result result = epmetUserOpenFeignClient.initBadge(badgeFormDTO); + if (result == null || !result.success()) { throw new RenException("初始化党员徽章信息失败"); } } From 5cd92d43774615ce7a201f313193f80deff391f6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 18 Nov 2020 15:35:26 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 4 +--- .../java/com/epmet/feign/EpmetUserOpenFeignClient.java | 9 +++------ .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 4 ++-- .../java/com/epmet/controller/UserBadgeController.java | 9 +++------ 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 31d670148a..aa77bd8eae 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -367,9 +367,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService if (StringUtils.isBlank(partyUserId)) { throw new RenException("addUserPartyBadge，用户Id不能为空"); } - AddUserPartyBadgeFormDTO badgeFormDTO = new AddUserPartyBadgeFormDTO(); - badgeFormDTO.setUserId(partyUserId); - Result result = epmetUserOpenFeignClient.initBadge(badgeFormDTO); + Result result = epmetUserOpenFeignClient.initBadge(partyUserId); if (result == null || !result.success()) { throw new RenException("初始化党员徽章信息失败"); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index ea35e420c0..b385738d82 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -10,10 +10,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -445,11 +442,11 @@ public interface EpmetUserOpenFeignClient { Result> queryGridAuditingBadgeCount(@RequestBody List gridIdList); /** - * @param formDTO + * @param userId * @author yinzuomei * @description 党员认证成功后 添加userBadge记录到数据库 * @Date 2020/11/12 15:41 **/ @PostMapping(value = "/epmetuser/more/badge/initbadge") - Result initBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO); + Result initBadge(@RequestParam String userId); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 2bbc2a83e4..6ac75b91e1 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -313,7 +313,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result initBadge(AddUserPartyBadgeFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", formDTO); + public Result initBadge(String partyUserId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "initBadge", partyUserId); } } 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 7524ffa1be..3cfab36c41 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 @@ -11,10 +11,7 @@ import com.epmet.dto.result.UserBadgeListResultDTO; import com.epmet.dto.result.UserOperListResultDTO; import com.epmet.service.UserBadgeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -119,8 +116,8 @@ public class UserBadgeController { * @date 2020/11/18 下午3:03 */ @PostMapping("initbadge") - public Result initPartyMemberBadge(@RequestBody AddUserPartyBadgeFormDTO formDTO) { - userBadgeService.initPartyMemberBadge(formDTO.getUserId()); + public Result initPartyMemberBadge(@RequestParam(required = false) String userId) { + userBadgeService.initPartyMemberBadge(userId); return new Result(); } }