Merge remote-tracking branch 'origin/develop' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -79,4 +79,12 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     void neighborHoodPropertyUpdate(@Param("list")List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement);
 
     List<IcNeighborHoodDTO> selectNeighborList(@Param("gridId")String gridId);
+
+    /**
+     * Desc: 删除物业关系
+     * @param neighborHoodIds
+     * @author zxc
+     * @date 2022/4/28 09:10
+     */
+    void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -762,7 +762,12 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     @Transactional
     public void neighborHoodPropertyUpdate(List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement) {
         if (CollectionUtils.isNotEmpty(updateNeighborHoodAndManagement)){
-            baseDao.neighborHoodPropertyUpdate(updateNeighborHoodAndManagement);
+            baseDao.delProperty(updateNeighborHoodAndManagement.stream().map(m -> m.getNeighborHoodId()).collect(Collectors.toList()));
+            List<IcNeighborHoodPropertyEntity> entities = ConvertUtils.sourceToTarget(updateNeighborHoodAndManagement, IcNeighborHoodPropertyEntity.class);
+            List<IcNeighborHoodPropertyEntity> collect = entities.stream().filter(e -> StringUtils.isNotBlank(e.getPropertyId())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)){
+                neighborHoodPropertyService.insertBatch(collect);
+            }
         }
     }
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -68,6 +68,16 @@
         )
     </update>
 
+    <!-- 删除物业关系 -->
+    <delete id="delProperty">
+        DELETE FROM ic_neighbor_hood_property
+        WHERE NEIGHBOR_HOOD_ID IN (
+            <foreach collection="neighborHoodIds" item="n" separator=",">
+                #{n}
+            </foreach>
+            )
+    </delete>
+
     <!--<select id="searchNeighborhoodByPage" resultType="map">
         select
             a.id as neighborHoodId,

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java

@@ -1,9 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.dto.IcResiUserAttachmentDTO;
+import com.epmet.dto.IcResiUserDTO;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.LinkedHashMap;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ public class RentTenantFormDTO implements Serializable {
     /**
      * 头像
      */
-    private String img;
+    private List<IcResiUserAttachmentDTO> images;
 
     /**
      * customerId
@@ -27,63 +28,18 @@ public class RentTenantFormDTO implements Serializable {
     private String customerId;
 
     /**
-     * gridId
+     * 身份证号
-     */
-    private String gridId;
-
-    /**
-     *
-     */
-    private String agencyId;
-
-    /**
-     *
-     */
-    private String pids;
-
-    /**
-     * 所属小区ID
-     */
-    private String villageId;
-
-    /**
-     * 所属楼宇Id
-     */
-    private String buildId;
-
-    /**
-     * 单元id
-     */
-    private String unitId;
-
-    /**
-     * 所属家庭Id
-     */
-    private String homeId;
-
-    /**
-     * 是否本地户籍
-     */
-    private String isBdhj;
-
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 手机号
      */
-    private String mobile;
+    private String idCard;
 
     /**
-     * 性别
+     * 人员类型 0：房东 1：租客
      */
-    private String gender;
+    private String type;
 
     /**
-     * 身份证号
+     * 人员信息
      */
-    private String idCard;
+    private IcResiUserDTO user;
 
 }

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

@@ -724,19 +724,19 @@ public interface EpmetUserOpenFeignClient {
      * @author zhy
      * @date 2022/4/26 10:48
      */
-    @PostMapping("/epmetuser/icresiuser/rent/rentUpdate")
+    @PostMapping("/epmetuser/icresiuser/rent/updateimage")
-    Result rentUpdate(@RequestBody RentTenantFormDTO formDTO);
+    Result updateImage(@RequestBody RentTenantFormDTO formDTO);
 
     /**
-     * 租客房东根据身份证更新头像
+     * 查询居民信息
      *
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result
      * @author zhy
      * @date 2022/4/26 10:48
      */
-    @PostMapping("/epmetuser/icresiuser/rent/tenantData")
+    @PostMapping("/epmetuser/icresiuser/rent/getrentresiuserinfo")
-    Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO);
+    Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO);
 
     @PostMapping("/epmetuser/icresiuser/userchartlist")
     Result<List<UserChartResultDTO>> userChartList(@RequestBody UserChartFormDTO userDTO);

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

@@ -529,13 +529,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
+    public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "rentUpdate", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateImage", formDTO);
     }
 
     @Override
-    public Result<RentTenantDataResultDTO> tenantData(RentTenantDataFormDTO formDTO) {
+    public Result<RentTenantDataResultDTO> getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "tenantData", formDTO);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRentResiUserInfo", formDTO);
     }
 
     @Override

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

@@ -240,9 +240,9 @@ public class IcResiUserController implements ResultDataResolver {
      * @author zhy
      * @date 2022/4/26 10:48
      */
-    @PostMapping("rent/rentUpdate")
+    @PostMapping("rent/updateimage")
-    public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
+    public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
-        String resiUserId = icResiUserService.rentUpdate(formDTO);
+        String resiUserId = icResiUserService.updateImage(formDTO);
         //推送MQ事件
         editResiMq(formDTO.getCustomerId(), resiUserId);
         return new Result();
@@ -268,10 +268,23 @@ public class IcResiUserController implements ResultDataResolver {
      * @author zhy
      * @date 2022/4/26 15:51
      */
-    @PostMapping("rent/tenantData")
+    @PostMapping("rent/getrentresiuserinfo")
-    public Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO) {
+    public Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<RentTenantDataResultDTO>().ok(icResiUserService.tenantData(formDTO));
+        return new Result<RentTenantDataResultDTO>().ok(icResiUserService.getRentResiUserInfo(formDTO));
+    }
+
+    /**
+     * 租客房东黑名单查询个人数据
+     *
+     * @param idCard
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PersonDataResultDTO>
+     * @author zhy
+     * @date 2022/4/26 15:51
+     */
+    @PostMapping("rent/getresiuserinfo/{idCard}")
+    public Result<List<RentTenantDataResultDTO>> getRentResiUserInfoByIdCard(@PathVariable("idCard") String idCard) {
+        return new Result<List<RentTenantDataResultDTO>>().ok(icResiUserService.getRentResiUserInfoByIdCard(idCard));
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserAttachmentEntity.java

@@ -41,14 +41,9 @@ public class IcResiUserAttachmentEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     * 项目ID
+     * 用户ID
      */
-	private String projectId;
+	private String userId;
-
-    /**
-     * 项目进展表ID
-     */
-	private String processId;
 
     /**
      * 文件所属内容(内部备注: public 公开答复:internal)

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

@@ -288,7 +288,17 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @author zhy
      * @date 2022/4/26 16:03
      */
-    RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO);
+    RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO);
+
+    /**
+     * 租客房东黑名单查询个人数据
+     *
+     * @param idCard
+     * @return com.epmet.dto.result.RentTenantDataResultDTO
+     * @author zhy
+     * @date 2022/4/26 16:03
+     */
+    List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard);
 
     /**
      * 租客房东根据身份证更新头像
@@ -298,5 +308,5 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @author zhy
      * @date 2022/4/26 10:48
      */
-    String rentUpdate(RentTenantFormDTO formDTO);
+    String updateImage(RentTenantFormDTO formDTO);
 }

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

@@ -136,9 +136,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
+        String idCard = (String) params.get("idCard");
 
         QueryWrapper<IcResiUserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
 
         return wrapper;
     }
@@ -1708,38 +1710,48 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public List<Map<String, Object>> dynamicQuery(String customerId, String formCode, String resultTableName, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<ResiUserQueryValueDTO> conditions, String currentStaffAgencyId, String staffOrgPath) {
         // List<String> finalSubTables = getFinalSubables(customerId, formCode, resultTableName, conditions);
         List<String> exportNeedTableList = showSqlColumns.stream().map(IcCustomExportResultDTO.SqlColumn::getTableName).collect(Collectors.toList());
-        Map<String,List<String>> map=getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList);
+        Map<String, List<String>> map = getFinalSubables(customerId, formCode, resultTableName, conditions, exportNeedTableList);
-        return baseDao.dynamicQuery(customerId,resultTableName,conditions,map.get("finalSubTables"),showSqlColumns,currentStaffAgencyId,staffOrgPath,map.get("groupByTables"));
+        return baseDao.dynamicQuery(customerId, resultTableName, conditions, map.get("finalSubTables"), showSqlColumns, currentStaffAgencyId, staffOrgPath, map.get("groupByTables"));
     }
 
     @Override
-    public RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO) {
+    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);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String rentUpdate(RentTenantFormDTO formDTO) {
+    public String updateImage(RentTenantFormDTO formDTO) {
-        String resiUserId;
+        String resiUserId = "";
         IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId());
-        if (null != userDTO && null != userDTO.getIdCard()) {
+        if (null != userDTO) {
-            GridInfoResultDTO deptInfo = govOrgFeignClient.queryGridInfo(formDTO.getGridId()).getData();
+            resiUserId = userDTO.getId();
-            // 没有该居民，新增一个居民
+            // 插入附件头像(只有一张)
-            IcResiUserEntity entity = new IcResiUserEntity();
+            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();
-        } else {
+
-            resiUserId = userDTO.getId();
+            // 新增用户后保存头像信息
+            List<IcResiUserAttachmentDTO> images = formDTO.getImages();
+            images.forEach(item -> item.setUserId(entity.getId()));
+            images.forEach(item -> icResiUserAttachmentService.save(item));
         }
-        // 插入附件头像
+
-        IcResiUserAttachmentDTO dto = new IcResiUserAttachmentDTO();
-        dto.setUserId(resiUserId);
-        dto.setAttachmentUrl(formDTO.getImg());
-        icResiUserAttachmentService.save(dto);
         return resiUserId;
     }
 
-
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -375,7 +375,6 @@
             ic_resi_user
         WHERE
             del_flag = '0'
-        AND customer_id = #{customerId}
         AND id_card = #{idCard}
     </select>