From 42c88be18404788dd74f4033dfeef07aaa2023a9 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 7 Dec 2021 08:14:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9"persondata"=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=8F=82=E6=96=B0=E5=A2=9EepmetUserId?=
 =?UTF-8?q?=EF=BC=8CicResiUserId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/PersonDataFormDTO.java    |  4 ++++
 .../com/epmet/dto/result/PersonDataResultDTO.java     | 11 ++++++++++-
 .../com/epmet/controller/IcResiUserController.java    |  4 +++-
 .../com/epmet/service/impl/IcResiUserServiceImpl.java | 11 +++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java
index 52d96870a2..e2355d145a 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java
@@ -19,4 +19,8 @@ public class PersonDataFormDTO implements Serializable {
 
     @NotBlank(message = "userId不能为空",groups = PersonDataForm.class)
     private String userId;
+
+
+    @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class)
+    private String customerId;
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
index 6a89bb2037..3d1334d249 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java
@@ -7,7 +7,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author zxc
@@ -19,6 +18,16 @@ public class PersonDataResultDTO implements Serializable {
 
     private static final long serialVersionUID = 5210308218052783909L;
 
+    /**
+     * epemt_user.user.id
+     */
+    private String epmetUserId;
+
+    /**
+     * ic_resi_user.id
+     */
+    private String icResiUserId;
+
     /**
      * 工作单位
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index f5720acd39..d6df9f57e0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -426,7 +426,9 @@ public class IcResiUserController {
      * @date 2021/11/3 9:21 上午
      */
     @PostMapping("persondata")
-    public Result<PersonDataResultDTO> personData(@RequestBody PersonDataFormDTO formDTO) {
+    public Result<PersonDataResultDTO> personData(@LoginUser TokenDto tokenDto,@RequestBody PersonDataFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO,PersonDataFormDTO.PersonDataForm.class);
         return new Result<PersonDataResultDTO>().ok(icResiUserService.personData(formDTO));
     }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 9510a50fe2..a78ec9c296 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -59,6 +59,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcResiUserService;
+import com.epmet.service.UserService;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -99,6 +100,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcResiUserImportServiceImpl icResiUserImportService;
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private UserService userService;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
@@ -528,6 +531,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (null == personData){
             return new PersonDataResultDTO();
         }
+        //新增以下2个返参
+        ResiUserFormDTO resiUserFormDTO = new ResiUserFormDTO();
+        resiUserFormDTO.setIcResiUserId(formDTO.getUserId());
+        resiUserFormDTO.setCustomerId(formDTO.getCustomerId());
+        ResiUserResDTO resiUserResDTO = userService.findUser(resiUserFormDTO);
+        personData.setEpmetUserId(null != resiUserResDTO ? resiUserResDTO.getEpmetUserId() : StrConstant.EPMETY_STR);
+        personData.setIcResiUserId(formDTO.getUserId());
+
         // 房屋信息查询
         Result<List<String>> listResult = govOrgOpenFeignClient.selectHouseInfoByIdCard(personData.getIdCard());
         if (!listResult.success()){