绑定房屋修改逻辑，org模块编写feignClient

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -632,4 +632,15 @@ public interface GovOrgOpenFeignClient {
      */
     @GetMapping("/gov/org/customeragency/subOrgList/{agencyId}")
     Result<List<SubOrgResDTO>> subOrgList(@PathVariable("agencyId")String agencyId);
+
+    /**
+     * 根据houseId查询数据
+     *
+     * @param houseId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseAgencyInfoResultDTO>
+     * @author LZN
+     * @date 2022/6/22 16:20
+     */
+    @PostMapping("/gov/org/ichouse/getHouseAgencyInfo")
+    Result<HouseAgencyInfoResultDTO> getHouseAgencyInfo(@RequestParam("houseId")String houseId);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -414,4 +414,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<List<SubOrgResDTO>> subOrgList(String agencyId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subOrgList",agencyId);
     }
+
+    @Override
+    public Result<HouseAgencyInfoResultDTO> getHouseAgencyInfo(String houseId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "subOrgList",houseId);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseAgencyInfoResultDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.service.IcHouseService;
@@ -90,4 +91,18 @@ public class IcHouseController {
         return new Result<List<HousesNameResultDTO>>().ok(icHouseService.getHousesNameByIdCards(idCards));
     }
 
+    /**
+     * 根据houseId查询数据
+     *
+     * @param houseId
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseAgencyInfoResultDTO>
+     * @author LZN
+     * @date 2022/6/22 16:18
+     */
+    @PostMapping("getHouseAgencyInfo")
+    public Result<HouseAgencyInfoResultDTO> getHouseAgencyInfo(@RequestParam("houseId") String houseId){
+        HouseAgencyInfoResultDTO dto = icHouseService.getHouseAgencyInfo(houseId);
+        return new Result<HouseAgencyInfoResultDTO>().ok(dto);
+    }
+
 }

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

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseAgencyInfoResultDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -125,4 +126,13 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     List<HousesNameResultDTO> getHousesNameByIdCards(List<String> idCards);
 
-}
+    /**
+     * 根据houseId查询数据
+     *
+     * @param houseId
+     * @return com.epmet.dto.result.HouseAgencyInfoResultDTO
+     * @author LZN
+     * @date 2022/6/22 16:18
+     */
+    HouseAgencyInfoResultDTO getHouseAgencyInfo(String houseId);
+}

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

@@ -21,6 +21,7 @@ import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
+import com.epmet.dto.result.HouseAgencyInfoResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.dto.result.HousesNameResultDTO;
@@ -292,4 +293,18 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return baseDao.getHousesNameByIdCards(idCards);
     }
 
-}
+    /**
+     * 根据houseId查询数据
+     *
+     * @param houseId
+     * @return com.epmet.dto.result.HouseAgencyInfoResultDTO
+     * @author LZN
+     * @date 2022/6/22 16:19
+     */
+    @Override
+    public HouseAgencyInfoResultDTO getHouseAgencyInfo(String houseId) {
+        HouseAgencyInfoResultDTO dto = baseDao.getHouseAgencyInfo(houseId);
+        return dto;
+    }
+
+}

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

@@ -1148,6 +1148,14 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result<IcResiUserInfoDTO>().ok(icResiUserService.getUserByIdCard(formDTO));
     }
 
+    /**
+     * 绑定房屋
+     *
+     * @param form
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/6/22 16:29
+     */
     @PostMapping("/bindHome")
     public Result bindHome(@RequestBody BindHomeFormDTO form){
         ValidatorUtils.validateEntity(form);

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

@@ -333,4 +333,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
 
     void updateByIdCard(@Param("entity") IcResiUserEntity entity);
+
+    String seletIdByIdCard(@Param("customerId") String customerId,@Param("idCard") String idCard);
+
+
 }

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

@@ -375,5 +375,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      */
     IcResiUserInfoDTO getUserByIdCard(IcResiUserDTO formDTO);
 
+    /**
+     * 绑定房屋
+     *
+     * @param form
+     * @return void
+     * @author LZN
+     * @date 2022/6/22 16:30
+     */
     void bindHome(BindHomeFormDTO form);
 }

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

@@ -58,7 +58,6 @@ 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;
@@ -82,9 +81,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.sql.Date;
+
 import java.sql.Timestamp;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -145,6 +145,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private GuardarDatosFeignClient feignClient;
     @Resource
     private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
+    @Resource
+    private GovOrgOpenFeignClient getGovOrgOpenFeignClient;
 
     private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
@@ -2265,6 +2267,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return result;
     }
 
+    /**
+     * 绑定房屋
+     *
+     * @param form
+     * @return void
+     * @author LZN
+     * @date 2022/6/22 16:30
+     */
     @Override
     public void bindHome(BindHomeFormDTO form) {
         // 根据idCard获取ca_redident表的数据
@@ -2289,33 +2299,51 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         // 将人的信息放入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())) {
+        // 进行日期转换
+        if(residentDetailByIdCard.getBirthday() == null){
+            throw new RenException("出生日期为空");
+        }
+        Date d = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String birthday = sdf.format(residentDetailByIdCard.getBirthday());
+
+        if (StringUtils.isNotBlank(residentDetailByIdCard.getIdCard())
+                && StringUtils.isNotBlank(residentDetailByIdCard.getResidentName())
+                && StringUtils.isNotBlank(residentDetailByIdCard.getTelephone())
+                && StringUtils.isNotBlank(birthday)) {
             entity.setIdCard(residentDetailByIdCard.getIdCard());
             entity.setName(residentDetailByIdCard.getResidentName());
             entity.setMobile(residentDetailByIdCard.getTelephone());
-            entity.setBirthday(residentDetailByIdCard.getBirthday().toString());
+            entity.setBirthday(birthday);
         } else {
             throw new RenException("人信息不全");
         }
         // 将房屋的信息放入ic_resi_user对象中
-        if (StringUtils.isBlank(houseInfo.getHomeId())
-                && StringUtils.isBlank(houseInfo.getNeighborHoodId())
-                && StringUtils.isBlank(houseInfo.getBuildingId())
-                && StringUtils.isBlank(houseInfo.getBuildingUnitId())) {
+        if (StringUtils.isNotBlank(houseInfo.getHomeId())
+                && StringUtils.isNotBlank(houseInfo.getNeighborHoodId())
+                && StringUtils.isNotBlank(houseInfo.getBuildingId())
+                && StringUtils.isNotBlank(houseInfo.getBuildingUnitId())) {
             entity.setHomeId(houseInfo.getHomeId());
             entity.setVillageId(houseInfo.getNeighborHoodId());
             entity.setBuildId(houseInfo.getBuildingId());
             entity.setUnitId(houseInfo.getBuildingUnitId());
+            entity.setAgencyId(houseInfo.getAgencyId());
+            // 根据homeId获取gridId和pids
+            Result<HouseAgencyInfoResultDTO> resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId());
+            entity.setGridId(resultDTOResult.getData().getGridId());
+            entity.setPids(resultDTOResult.getData().getPids());
         } else {
             throw new RenException("房屋信息不全");
         }
+
         if (baseDao.selectCountByIdCard(form.getIdCard(), form.getCustomerId()) > 0) {
-            baseDao.updateByIdCard(entity);
+           String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
+           baseDao.updateByIdCard(entity);
+
         } else {
             baseDao.insert(entity);
+            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
+
         }
 
     }

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

@@ -221,7 +221,8 @@
             home_id = #{entity.homeId},
             village_id = #{entity.villageId},
             build_id = #{entity.buildId},
-            unit_id = #{entity.unitId}
+            unit_id = #{entity.unitId},
+            updated_time = now()
         where
             id_card = #{entity.idCard}
             AND customer_id = #{entity.customerId}
@@ -1084,5 +1085,8 @@
             and customer_id = #{customerId}
             and del_flag = '0'
     </select>
+    <select id="seletIdByIdCard" resultType="java.lang.String">
+        select id from ic_resi_user where id_card = #{idCard} and customer_id = #{customerId}
+    </select>
 
 </mapper>