居民信息获取

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -230,6 +230,19 @@ public class ThirdLoginController {
         return new Result<ResiRegisterLantuResultDTO>().ok(thirdLoginService.resiRegisterLantu(formDTO));
     }
 
+    /**
+     * @Description: 获取userBaseInfoId 如果获取不到 进行上面的居民注册
+     * @param formDTO:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiRegisterLantuResultDTO>
+     * @Author: lichao
+     * @Date: 2024/4/28 09:45
+     */
+    @PostMapping("resiInfo-lantu")
+    public Result<ResiRegisterLantuResultDTO> resiInfoLantu(@RequestBody ResiInfoLantuFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<ResiRegisterLantuResultDTO>().ok(thirdLoginService.resiInfoLantu(formDTO));
+    }
+
     /**
      * 根据免登授权码, 获取登录用户身份
      *

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;
+
+
+
+}
+

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

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<LantuRegisterResiResDTO> lantuRegisterResi = epmetUserOpenFeignClient.lantuResiInfo(lantuRegisterResiFormDTO);
+
+        if (!lantuRegisterResi.success() || null == lantuRegisterResi.getData()) {
+        }else{
+            resiRegisterLantuResultDTO.setUserBaseInfoId(lantuRegisterResi.getData().getEpmetUserId());
+        }
+
+        return resiRegisterLantuResultDTO;
+    }
+
+
     @Override
     public UserTokenResultDTO govLoginInternalDing(DingAppLoginMdFormDTO formDTO) {
         // 获取用户手机号

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -988,6 +988,11 @@ public interface EpmetUserOpenFeignClient {
     Result<LantuRegisterResiResDTO> lantuRegisterResi(@RequestBody LantuRegisterResiFormDTO formDTO);
 
 
+    @PostMapping("/epmetuser/userbaseinfo/lantuResiInfo")
+    Result<LantuRegisterResiResDTO> lantuResiInfo(@RequestBody LantuRegisterResiFormDTO formDTO);
+
+
+
     @PostMapping("/epmetuser/dataSyncConfig/dataSyncForYanTaiTask")
     Result dataSyncForYanTaiTask(@RequestBody DataSyncTaskParam formDTO);
 

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<LantuRegisterResiResDTO> 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);

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

@@ -262,6 +262,11 @@ public class UserBaseInfoController {
         return new Result<LantuRegisterResiResDTO>().ok(userBaseInfoService.lantuRegisterResi(formDTO));
     }
 
+    @PostMapping("lantuResiInfo")
+    public Result<LantuRegisterResiResDTO> lantuResiInfo(@RequestBody LantuRegisterResiFormDTO formDTO){
+        return new Result<LantuRegisterResiResDTO>().ok(userBaseInfoService.lantuResiInfo(formDTO));
+    }
+
     /**
      * 来源于烟台需求，pc端新增菜单：用户完善信息列表
      * @return

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

@@ -224,6 +224,9 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
 
     LantuRegisterResiResDTO lantuRegisterResi(LantuRegisterResiFormDTO formDTO);
 
+
+    LantuRegisterResiResDTO lantuResiInfo(LantuRegisterResiFormDTO formDTO);
+
     /**
      * 用户完善信息列表
      * @param formDTO

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

@@ -661,6 +661,18 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     }
 
 
+    @Override
+    public LantuRegisterResiResDTO lantuResiInfo(LantuRegisterResiFormDTO formDTO) {
+
+        LantuRegisterResiResDTO result = new LantuRegisterResiResDTO();
+
+        UserBaseInfoEntity baseInfo = baseDao.selectUserByMobile(formDTO.getCustomerId(),formDTO.getMobile());
+        if (baseInfo!=null){
+            result.setEpmetUserId(baseInfo.getId());
+        }
+        return result;
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)