绑定网格接口

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

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class BindHomeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6084569462551209768L;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空")
+    private String idCard;
+
+    /**
+     * 房屋id
+     */
+    @NotBlank(message = "房屋id不能为空")
+    private String homeId;
+
+    /**
+     * 用户id
+     */
+    private String customerId;
+}

epmet-user/epmet-user-server/pom.xml

@@ -140,6 +140,12 @@
             <artifactId>common-service-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>open-data-worker-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1147,4 +1147,12 @@ public class IcResiUserController implements ResultDataResolver {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         return new Result<IcResiUserInfoDTO>().ok(icResiUserService.getUserByIdCard(formDTO));
     }
+
+    @PostMapping("/bindHome")
+    public Result bindHome(@RequestBody BindHomeFormDTO form){
+        ValidatorUtils.validateEntity(form);
+        form.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        icResiUserService.bindHome(form);
+        return new Result();
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -328,4 +328,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @Date 2022/5/19 10:40
      */
     List<IcVolunteerPolyDTO> getVolunteerList(@Param("customerId") String customerId, @Param("userId") String userId);
+
+    int selectCountByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId);
+
+
+    void updateByIdCard(@Param("entity") IcResiUserEntity entity);
 }

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

@@ -374,4 +374,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/5/20 9:59
      */
     IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO);
+
+    void bindHome(BindHomeFormDTO form);
 }

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

@@ -58,6 +58,10 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
+import com.epmet.opendata.dto.form.CaResidentDetailsFormDTO;
+import com.epmet.opendata.dto.form.GetResidentDetailByIdCardFormDTO;
+import com.epmet.opendata.dto.result.ResidentByIdCardResultDTO;
+import com.epmet.opendata.feign.GuardarDatosFeignClient;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.*;
 import com.github.pagehelper.Page;
@@ -137,6 +141,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcPartyMemberDao icPartyMemberDao;
     @Resource
     private IcVolunteerDao icVolunteerDao;
+    @Autowired
+    private GuardarDatosFeignClient feignClient;
     @Resource
     private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
 
@@ -977,6 +983,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         map.put("groupByTables", new ArrayList<>(groupByTables));
         return map;
     }
+
     /**
      * @param formDTO
      * @Description 查询个人数据
@@ -1064,6 +1071,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
         return personData;
     }
+
     /**
      * @param formDTO
      * @Description 根据名字搜索
@@ -2020,10 +2028,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
 
-
-
-
-
     @Override
     public List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO) {
         //如果是组织 且非顶级组织 则利用pids 查询 本级及下级
@@ -2261,8 +2265,64 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return result;
     }
 
+    @Override
+    public void bindHome(BindHomeFormDTO form) {
+        // 根据idCard获取ca_redident表的数据
+        if (StringUtils.isBlank(form.getIdCard())) {
+            throw new RenException("身份证号不能为空");
+        }
+        GetResidentDetailByIdCardFormDTO dto = new GetResidentDetailByIdCardFormDTO();
+        dto.setIdCard(form.getIdCard());
+        Result<ResidentByIdCardResultDTO> result = feignClient.getResidentDetailByIdCard(dto);
+        ResidentByIdCardResultDTO residentDetailByIdCard = result.getData();
+        if (org.springframework.util.StringUtils.isEmpty(residentDetailByIdCard)) {
+            throw new RenException("获取不到人的信息");
+        }
+        // 根据房屋id获取房屋信息
+        if (StringUtils.isBlank(form.getHomeId())) {
+            throw new RenException("房屋id不能为空");
+        }
+        HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), form.getHomeId());
+        if (org.springframework.util.StringUtils.isEmpty(houseInfo)) {
+            throw new RenException("获取不到房屋信息");
+        }
+        // 将人的信息放入ic_resi_user对象中
+        IcResiUserEntity entity = new IcResiUserEntity();
+        entity.setCustomerId(form.getCustomerId());
+        if (StringUtils.isBlank(residentDetailByIdCard.getIdCard())
+                && StringUtils.isBlank(residentDetailByIdCard.getResidentName())
+                && StringUtils.isBlank(residentDetailByIdCard.getTelephone())
+                && StringUtils.isBlank(residentDetailByIdCard.getBirthday().toString())) {
+            entity.setIdCard(residentDetailByIdCard.getIdCard());
+            entity.setName(residentDetailByIdCard.getResidentName());
+            entity.setMobile(residentDetailByIdCard.getTelephone());
+            entity.setBirthday(residentDetailByIdCard.getBirthday().toString());
+        } else {
+            throw new RenException("人信息不全");
+        }
+        // 将房屋的信息放入ic_resi_user对象中
+        if (StringUtils.isBlank(houseInfo.getHomeId())
+                && StringUtils.isBlank(houseInfo.getNeighborHoodId())
+                && StringUtils.isBlank(houseInfo.getBuildingId())
+                && StringUtils.isBlank(houseInfo.getBuildingUnitId())) {
+            entity.setHomeId(houseInfo.getHomeId());
+            entity.setVillageId(houseInfo.getNeighborHoodId());
+            entity.setBuildId(houseInfo.getBuildingId());
+            entity.setUnitId(houseInfo.getBuildingUnitId());
+        } else {
+            throw new RenException("房屋信息不全");
+        }
+        if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
+            baseDao.updateByIdCard(entity);
+        } else {
+            baseDao.insert(entity);
+        }
+
+    }
+
     /**
      * desc:根据字段值获取 options
+     *
      * @param customerId
      * @param columnName
      * @return

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

@@ -211,6 +211,21 @@
     <update id="updateSubTableToDel" parameterType="map">
         update ${subTalbeName} set del_flag='1' where IC_RESI_USER=#{icResiUserId}
     </update>
+    <update id="updateByIdCard">
+        update
+            ic_resi_user
+        set
+            name = #{entity.name},
+            mobile = #{entity.mobile},
+            birthday = #{entity.birthday},
+            home_id = #{entity.homeId},
+            village_id = #{entity.villageId},
+            build_id = #{entity.buildId},
+            unit_id = #{entity.unitId}
+        where
+            id_card = #{entity.idCard}
+            AND customer_id = #{entity.customerId}
+    </update>
 
     <select id="dynamicQuery" parameterType="map" resultType="java.util.LinkedHashMap">
         select
@@ -1059,5 +1074,15 @@
                 AND a.ID = #{userId}
             </if>
     </select>
+    <select id="selectCountByIdCard" resultType="java.lang.Integer">
+        select
+            count(*)
+        from
+            ic_resi_user
+        where
+            id_card = #{idCard}
+            and customer_id = #{customerId}
+            and del_flag = '0'
+    </select>
 
 </mapper>