From 599cd8c35f65d32fe1ca1aae18e4e8e3245f7de4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sun, 28 Apr 2024 09:46:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdLoginController.java | 13 +++++++ .../epmet/dto/form/ResiInfoLantuFormDTO.java | 34 +++++++++++++++++++ .../com/epmet/service/ThirdLoginService.java | 3 ++ .../service/impl/ThirdLoginServiceImpl.java | 26 ++++++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 5 +++ .../EpmetUserOpenFeignClientFallback.java | 6 ++++ .../controller/UserBaseInfoController.java | 5 +++ .../epmet/service/UserBaseInfoService.java | 3 ++ .../service/impl/UserBaseInfoServiceImpl.java | 12 +++++++ 9 files changed, 107 insertions(+) create mode 100644 epmet-auth/src/main/java/com/epmet/dto/form/ResiInfoLantuFormDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index ca92e9f17f..2ad4bc089a 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -230,6 +230,19 @@ public class ThirdLoginController { return new Result().ok(thirdLoginService.resiRegisterLantu(formDTO)); } + /** + * @Description: 获取userBaseInfoId 如果获取不到 进行上面的居民注册 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result + * @Author: lichao + * @Date: 2024/4/28 09:45 + */ + @PostMapping("resiInfo-lantu") + public Result resiInfoLantu(@RequestBody ResiInfoLantuFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(thirdLoginService.resiInfoLantu(formDTO)); + } + /** * 根据免登授权码, 获取登录用户身份 * diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ResiInfoLantuFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ResiInfoLantuFormDTO.java new file mode 100644 index 0000000000..63dd57da68 --- /dev/null +++ b/epmet-auth/src/main/java/com/epmet/dto/form/ResiInfoLantuFormDTO.java @@ -0,0 +1,34 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description: 蓝图 注册居民入参 + * @Author: lichao + * @Date: 2023/8/15 09:25 + */ +@Data +public class ResiInfoLantuFormDTO { + + + @NotBlank(message = "loginMobile不能为空") + private String loginMobile; + + private String nickName; + + private String gridId; + + private String areaCode; + + private String realName; + + private String sex; + + private String avatarUrl; + + + +} + diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java index 979d7ca592..c69774c5bf 100644 --- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java @@ -123,6 +123,9 @@ public interface ThirdLoginService { */ ResiRegisterLantuResultDTO resiRegisterLantu(ResiRegisterLantuFormDTO formDTO); + + ResiRegisterLantuResultDTO resiInfoLantu(ResiInfoLantuFormDTO formDTO); + /** * desc:企业内部应用 工作端登录 * @param formDTO 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 f0faf8ac7b..611c120306 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 @@ -1177,6 +1177,32 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol return resiRegisterLantuResultDTO; } + + @Override + public ResiRegisterLantuResultDTO resiInfoLantu(ResiInfoLantuFormDTO formDTO) { + + // 最后返回给烟台的东西 最后可以跟我们系统关联起来 + ResiRegisterLantuResultDTO resiRegisterLantuResultDTO = new ResiRegisterLantuResultDTO(); + + // 用来注册居民端 + LantuRegisterResiFormDTO lantuRegisterResiFormDTO = new LantuRegisterResiFormDTO(); + // customer 给蓝图用 customerId 写死 烟台 +// lantuRegisterResiFormDTO.setCustomerId("1535072605621841922"); + lantuRegisterResiFormDTO.setCustomerId(getCurrentCustomerId()); + lantuRegisterResiFormDTO.setMobile(formDTO.getLoginMobile()); + + // 注册 + Result lantuRegisterResi = epmetUserOpenFeignClient.lantuResiInfo(lantuRegisterResiFormDTO); + + if (!lantuRegisterResi.success() || null == lantuRegisterResi.getData()) { + }else{ + resiRegisterLantuResultDTO.setUserBaseInfoId(lantuRegisterResi.getData().getEpmetUserId()); + } + + return resiRegisterLantuResultDTO; + } + + @Override public UserTokenResultDTO govLoginInternalDing(DingAppLoginMdFormDTO formDTO) { // 获取用户手机号 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 e9ced796be..0feb10a84f 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 @@ -988,6 +988,11 @@ public interface EpmetUserOpenFeignClient { Result lantuRegisterResi(@RequestBody LantuRegisterResiFormDTO formDTO); + @PostMapping("/epmetuser/userbaseinfo/lantuResiInfo") + Result lantuResiInfo(@RequestBody LantuRegisterResiFormDTO formDTO); + + + @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask") Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam 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 426121e80b..ef423fff70 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 @@ -722,6 +722,12 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "lantuRegisterResi", formDTO); } + @Override + public Result lantuResiInfo(LantuRegisterResiFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "lantuResiInfo", formDTO); + } + + @Override public Result dataSyncForYanTaiTask(DataSyncTaskParam formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "dataSyncForYanTaiTask", formDTO); 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 bdca689755..6fb6bc4c9f 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 @@ -262,6 +262,11 @@ public class UserBaseInfoController { return new Result().ok(userBaseInfoService.lantuRegisterResi(formDTO)); } + @PostMapping("lantuResiInfo") + public Result lantuResiInfo(@RequestBody LantuRegisterResiFormDTO formDTO){ + return new Result().ok(userBaseInfoService.lantuResiInfo(formDTO)); + } + /** * 来源于烟台需求，pc端新增菜单：用户完善信息列表 * @return 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 518675be67..6263040231 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 @@ -224,6 +224,9 @@ public interface UserBaseInfoService extends BaseService { LantuRegisterResiResDTO lantuRegisterResi(LantuRegisterResiFormDTO formDTO); + + LantuRegisterResiResDTO lantuResiInfo(LantuRegisterResiFormDTO formDTO); + /** * 用户完善信息列表 * @param formDTO 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 b7a1b00e0a..c4ca1e9196 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 @@ -661,6 +661,18 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl