elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

党员认证添加方法

dev_shibei_match
jianjun 5 years ago
parent
8be9aa78c1
commit
6957e6dc28
9 changed files with 109 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
  2. 17
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java
  3. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java
  4. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
  5. 19
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java
  6. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java
  7. 31
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
  8. 44
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
  9. 32
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

16
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java
View File

@ -176,20 +176,4 @@ public class BadgeController {
public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList) {
return new Result<List<GridAuditingBadgeCountResultDTO>>().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();
}
}

17
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java
View File

@ -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<Boolean> audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
Boolean aBoolean = userBadgeService.addUserPartyBadgeRecord(tokenDto, formDTO);
return new Result().ok(aBoolean);
}
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java
View File

@ -110,7 +110,7 @@ public class UserBaseInfoController {
**/
@PostMapping("queryuserbaseinfo")
public Result<List<UserBaseInfoResultDTO>> queryUserBaseInfo(@RequestBody List<String> userIdList) {
List<UserBaseInfoResultDTO> list = userBaseInfoService.queryUserBaseInfo(userIdList);
List<UserBaseInfoResultDTO> list = userBaseInfoService.queryUserBaseInfoFromCache(userIdList);
return new Result<List<UserBaseInfoResultDTO>>().ok(list);
}

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java
View File

@ -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<BadgeEntity> {
* @Date 2020/11/12 15:56
**/
List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList);
/**
* desc: 添加用户党员徽章记录
*
* @param tokenDto
* @param formDTO
* @return java.lang.Boolean
* @author LiuJanJun
* @date 2020/11/18 10:32 上午
*/
Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO);
}

19
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java
View File

@ -90,12 +90,23 @@ public interface UserBadgeService {
List<UserBadgeUnitFormDTO> getUserSortedBadge(String userId,String customerId);
/**
* @Description 批量获取用户显示徽章
* @param customerId
* @param userIds
* @return java.util.Map<java.lang.String,java.util.List< com.epmet.dto.result.UserBadgeInfoResultDTO>>
* @return java.util.Map<java.lang.String, java.util.List < com.epmet.dto.result.UserBadgeInfoResultDTO>>
* @Description 批量获取用户显示徽章
* @author wangc
* @date 2020.11.10 15:12
*/
Map<String,List<UserBadgeInfoResultDTO>> getBatchUserSortedBadge(String customerId, List<String> userIds);
*/
Map<String, List<UserBadgeInfoResultDTO>> getBatchUserSortedBadge(String customerId, List<String> userIds);
/**
* desc: 添加用户党员徽章记录
*
* @param tokenDto
* @param formDTO
* @return java.lang.Boolean
* @author LiuJanJun
* @date 2020/11/18 10:32 上午
*/
Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO);
}

13
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java
View File

@ -101,13 +101,22 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
void delete(String[] ids);
/**
* @return java.util.List<com.epmet.dto.result.UserBaseInfoResultDTO>
* @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<com.epmet.dto.result.UserBaseInfoResultDTO>
* @author yinzuomei
* @description 传入用户id集合，返回用户的基本信息（包含微信基本信息）
* @Date 2020/7/22 9:35
**/
List<UserBaseInfoResultDTO> queryUserBaseInfo(List<String> userIdList);
List<UserBaseInfoResultDTO> queryUserBaseInfoFromCache(List<String> userIdList);
/**
* @return void

31
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java
View File

@ -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<BadgeDao, BadgeEntity> imp
private MessageFeignClient messageFeignClient;
@Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
@Autowired
private UserBaseInfoRedis userBaseInfoRedis;
@Override
@ -428,32 +425,4 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> 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;
}
}

44
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
View File

@ -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<String> userIds = new ArrayList<>();
userIds.add(certificationAddFormDTO.getUserId());
List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds);
List<UserBaseInfoResultDTO> 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<java.lang.String,java.util.List< com.epmet.dto.result.UserBadgeInfoResultDTO>>
* @return java.util.Map<java.lang.String, java.util.List < com.epmet.dto.result.UserBadgeInfoResultDTO>>
* @author wangc
* @date 2020.11.10 15:12
*/
@Override
public Map<String, List<UserBadgeInfoResultDTO>> getBatchUserSortedBadge(String customerId, List<String> userIds) {
List<UserBadgeInfoResultDTO> badges = userBadgeDao.selectBatchUserSortedBadge(customerId,userIds);
if(CollectionUtils.isEmpty(badges)) return Collections.EMPTY_MAP;
return badges.stream().collect(Collectors.groupingBy(UserBadgeInfoResultDTO :: getUserId));
List<UserBadgeInfoResultDTO> 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;
}
}

32
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
View File

@ -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<UserBaseInfoDao, Us
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @param userId
* @return java.util.List<com.epmet.dto.result.UserBaseInfoResultDTO>
* @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<UserBaseInfoResultDTO> 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<com.epmet.dto.result.UserBaseInfoResultDTO>
@ -135,11 +157,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
* @Date 2020/7/22 9:35
**/
@Override
public List<UserBaseInfoResultDTO> queryUserBaseInfo(List<String> userIdList) {
if(null==userIdList||userIdList.size()<1){
public List<UserBaseInfoResultDTO> queryUserBaseInfoFromCache(List<String> userIdList) {
if (null == userIdList || userIdList.size() < 1) {
return new ArrayList<>();
}
List<UserBaseInfoResultDTO> userBaseInfoList=new ArrayList<>();
List<UserBaseInfoResultDTO> userBaseInfoList = new ArrayList<>();
/* for(String userId:userIdList){
UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId);
if(null!=userBaseInfoResultDTO){
@ -152,7 +174,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
//为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
//if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
userBaseInfoList.add(baseInfo);
userBaseInfoList.add(baseInfo);
//}
});
return userBaseInfoList;
@ -166,7 +188,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
**/
@Override
public void initBaseInfo() {
List<UserWechatDTO> userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp();
List<UserWechatDTO> userWechatDTOList = userWechatDao.selectNotInUserBaseInfoTemp();
List<String> userIdList=new ArrayList<>();
for(UserWechatDTO userWechatDTO:userWechatDTOList){
userIdList.add(userWechatDTO.getUserId());

Write Preview
Loading…
Cancel
Save