From 54f400bd354dd16bb814c5970ee0a9a22679b2e0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 21 May 2020 14:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=9B=E5=85=A5=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=97=B6=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/UserResiInfoDao.java | 9 ++++++ .../impl/RegisterRelationServiceImpl.java | 28 +++++++++++-------- .../main/resources/mapper/UserResiInfoDao.xml | 21 ++++++++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index 4f57bfa73c..a47f215bdc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -47,6 +47,15 @@ public interface UserResiInfoDao extends BaseDao { **/ UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + /** + * @Description 查询用户注册信息 不按照客户Id查询 + * @param userResiInfoFormDTO + * @return UserResiInfoResultDTO + * @author wangc + * @date 2020.05.21 13:18 + **/ + UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO); + /** * @Author sun * @Description 根据手机号查询居民注册信息(user_resi_info)表数据 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 e2f315d22f..e91d320413 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 @@ -47,6 +47,8 @@ import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.RegisterRelationRedis; import com.epmet.service.RegisterRelationService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -62,6 +64,8 @@ import java.util.*; @Service public class RegisterRelationServiceImpl extends BaseServiceImpl implements RegisterRelationService { + private static final Logger log = LoggerFactory.getLogger(RegisterRelationServiceImpl.class); + @Autowired private RegisterRelationRedis registerRelationRedis; @@ -227,23 +231,25 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl UserResiRegisterVisitRecord = - userResiRegisterVisitDao.selectUserResiRegisterVisit(userResiRegisterVisitDTO); + //UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO(); + //userResiRegisterVisitDTO.setDelFlag(NumConstant.ZERO); + //userResiRegisterVisitDTO.setUserId(enterGridFormDTO.getUserId()); + //List UserResiRegisterVisitRecord = + // userResiRegisterVisitDao.selectUserResiRegisterVisit(userResiRegisterVisitDTO); } } } UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO(); userResiInfoFormDTO.setUserId(enterGridFormDTO.getUserId()); - userResiInfoFormDTO.setCustomerId(enterGridFormDTO.getCustomerId()); - UserResiInfoResultDTO userResiInfo = userResiInfoDao.selectUserResiInfoDTO(userResiInfoFormDTO); - resultObj.setNickname(userResiInfo.getShowName()); - + UserResiInfoResultDTO userResiInfo = userResiInfoDao.selectUserResiInfoNotByCustId(userResiInfoFormDTO); + if(null != userResiInfo) { + resultObj.setNickname(userResiInfo.getShowName()); + }else{ + log.warn(String.format("查找用户居民注册信息失败，用户Id:【%s】",enterGridFormDTO.getUserId())); + } } //3.获取权限 @@ -267,7 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl + + +