From 25e787cca9cdef153a6a86f31f43bd5dd21681a3 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 17 Aug 2023 16:01:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserBaseInfoServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 2b61ff57f5..c9750fcbc0 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 @@ -706,6 +706,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl registerWrapper = new LambdaQueryWrapper<>(); registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId()); registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId()); @@ -717,10 +721,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Thu, 17 Aug 2023 16:07:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=93=9D=E5=9B=BEtoken?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 809bac1a0a..e8ff779f79 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1154,7 +1154,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol Result lantuRegisterResi = epmetUserOpenFeignClient.lantuRegisterResi(lantuRegisterResiFormDTO); if (!lantuRegisterResi.success() || null == lantuRegisterResi.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民注册异常", "居民注册异常"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), JSON.toJSONString(lantuRegisterResi), "居民注册异常"); } resiRegisterLantuResultDTO.setUserBaseInfoId(lantuRegisterResi.getData().getEpmetUserId()); From 62fba5204abe03bebd72adc29d72f9372c7463b9 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 17 Aug 2023 17:40:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?token=E8=8E=B7=E5=8F=96=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/ResiHfiveAppLoginResDTO.java | 3 +++ .../com/epmet/service/impl/ThirdLoginServiceImpl.java | 3 +++ .../epmet/service/impl/UserBaseInfoServiceImpl.java | 11 +++++++++++ 3 files changed, 17 insertions(+) diff --git a/epmet-auth/src/main/java/com/epmet/dto/result/ResiHfiveAppLoginResDTO.java b/epmet-auth/src/main/java/com/epmet/dto/result/ResiHfiveAppLoginResDTO.java index 972f3efd55..50924102f8 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/result/ResiHfiveAppLoginResDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/result/ResiHfiveAppLoginResDTO.java @@ -10,5 +10,8 @@ import lombok.Data; @Data public class ResiHfiveAppLoginResDTO { private String authorization; + + // 网格id + private String gridId; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index e8ff779f79..4cfe2e556f 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -1114,6 +1114,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol HfiveLoginResiFormDTO hfiveLoginResiFormDTO = new HfiveLoginResiFormDTO(); hfiveLoginResiFormDTO.setUserBaseInfoId(formDTO.getUserBaseInfoId()); + hfiveLoginResiFormDTO.setCustomerId(getCurrentCustomerId()); // 2、调用userfeign接口获取userId、注册网格相关信息 Result loginResiResDTOResult = epmetUserOpenFeignClient.hFiveResiLogin(hfiveLoginResiFormDTO); @@ -1123,6 +1124,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "提供的居民id获取居民信息失败:"+ formDTO.getUserBaseInfoId(), "获取token失败"); } DingLoginResiResDTO resiResDTO = loginResiResDTOResult.getData(); + // 网格id + resDTO.setGridId(loginResiResDTOResult.getData().getGridId()); // 3.生成token，并且存放Redis String token = this.saveTokenDtoHfive(AppClientConstant.APP_RESI, AppClientConstant.LAN_TU, resiResDTO.getEpmetUserId(), getCurrentCustomerId()); 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 c9750fcbc0..0a82cefbec 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 @@ -645,6 +645,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl registerWrapper = new LambdaQueryWrapper<>(); + registerWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId()); + registerWrapper.eq(RegisterRelationEntity::getUserId, baseInfo.getUserId()); + registerWrapper.eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR); + RegisterRelationEntity registerRelation = registerRelationDao.selectOne(registerWrapper); + if (registerRelation!=null){ + result.setGridId(registerRelation.getGridId()); + }else{ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民网格关系失败，请更新注册信息", "获取居民网格关系失败"); + } } return result; }