Merge branch '市北测试' into 市北生产

# Conflicts:
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/gov-access/gov-access-server/pom.xml
#	epmet-module/gov-org/gov-org-server/pom.xml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
#	epmet-user/epmet-user-server/pom.xml
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -542,5 +542,4 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<UserChartResultDTO>> userChartList(UserChartFormDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartList", userDTO);
     }
-
 }

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

@@ -241,8 +241,8 @@ public class IcResiUserController implements ResultDataResolver {
      * @date 2022/4/26 10:48
      */
     @PostMapping("rent/updateimage")
-    public Result updateImage(@LoginUser TokenDto tokenDto, @RequestBody RentTenantFormDTO formDTO) {
+    public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
-        String resiUserId = icResiUserService.updateImage(tokenDto, formDTO);
+        String resiUserId = icResiUserService.updateImage(formDTO);
         //推送MQ事件
         editResiMq(formDTO.getCustomerId(), resiUserId);
         return new Result();

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

@@ -297,6 +297,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard);
 
+    /**
+     * 租客房东根据身份证更新头像
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/4/26 10:48
+     */
+    String updateImage(RentTenantFormDTO formDTO);
+
     /**
      * 租客房东根据身份证更新头像
      *

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

@@ -1642,6 +1642,20 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     }
 
+    @Override
+    public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
+        IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId());
+        return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
+    }
+
+    @Override
+    public List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard) {
+        Map<String, Object> params = new HashMap<>(8);
+        params.put("idCard", idCard);
+        List<IcResiUserEntity> entityList = baseDao.selectList(getWrapper(params));
+        return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class);
+    }
+
     /**
      * @Author sun
      * @Description 【人房】居民总数饼图
@@ -1737,17 +1751,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     @Override
-    public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
+    @Transactional(rollbackFor = Exception.class)
-        IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId());
+    public String updateImage(RentTenantFormDTO formDTO) {
-        return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
+        String resiUserId = "";
-    }
+        IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId());
+        if (null != userDTO) {
+            resiUserId = userDTO.getId();
+            // 插入附件头像(只有一张)
+            List<IcResiUserAttachmentDTO> images = formDTO.getImages();
+            images.forEach(item -> item.setUserId(userDTO.getId()));
+            images.forEach(item-> icResiUserAttachmentService.save(item));
+        } else if (NumConstant.ONE_STR.equals(formDTO.getType())) {
+            // 如果是新增的租客，需要新增一条信息，不存在的房东就不管了
+            IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
+            insert(entity);
+            resiUserId = entity.getId();
 
-    @Override
+            // 新增用户后保存头像信息
-    public List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard) {
+            List<IcResiUserAttachmentDTO> images = formDTO.getImages();
-        Map<String, Object> params = new HashMap<>(8);
+            images.forEach(item -> item.setUserId(entity.getId()));
-        params.put("idCard", idCard);
+            images.forEach(item -> icResiUserAttachmentService.save(item));
-        List<IcResiUserEntity> entityList = baseDao.selectList(getWrapper(params));
+        }
-        return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class);
+
+        return resiUserId;
     }
 
     @Override