信息采集审核

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CollectHouseFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wgf
+ * @date 2022/8/3 11:18
+ */
+@Data
+public class CollectHouseFormDTO implements Serializable {
+    private static final long serialVersionUID = 2636608477324780974L;
+
+    private String id;
+
+    /**
+     * 房屋状态  1：出租 0：自住  2：闲置 3：未售出
+     */
+    private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetHouseInfoToCollectFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author wgf
+ * @date 2022/8/3 11:18
+ */
+@Data
+public class GetHouseInfoToCollectFormDTO implements Serializable {
+    private static final long serialVersionUID = 2636608477324780974L;
+
+    /**
+     * 单元
+     */
+    private String buildingUnitId;
+
+    /**
+     * 门牌号
+     */
+    private String doorName;
+
+}

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoCollectResultDTO.java

@@ -0,0 +1,124 @@
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * desc:房屋列表结果类
+ *
+ * @author liujianjun
+ */
+@Data
+public class IcHouseInfoCollectResultDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 4963952996288796744L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 所属组织的PIDS，包括agency，grid
+     */
+    private String orgIdPath;
+
+    /**
+     * 小区id
+     */
+    private String neighborHoodId;
+
+    /**
+     * 片区id，neighbor_hood_part.id,可为空。
+     */
+    private String partId;
+
+    /**
+     * 所属楼栋id
+     */
+    private String buildingId;
+
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+
+    /**
+     * 房屋名字后台插入时生成
+     */
+    private String houseName;
+
+    /**
+     * 全名:小区，楼栋，单元，房屋
+     */
+    private String fullName;
+
+    /**
+     * 门牌号
+     */
+    private String doorName;
+
+    /**
+     * 房屋类型，这里存储字典value就可以
+     */
+    private String houseType;
+
+    /**
+     * 存储字典value
+     */
+    private String purpose;
+
+    /**
+     * 1：出租 0：自住  2：闲置 3：未出售
+     */
+    private Integer rentFlag;
+
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 房主电话
+     */
+    private String ownerPhone;
+
+    /**
+     * 房主身份证号
+     */
+    private String ownerIdCard;
+
+    /**
+     * 排序
+     */
+    private BigDecimal sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    private String houseQrcodeUrl;
+
+    /**
+     * 居住人数
+     */
+    private Integer resiNumber;
+    /**
+     * 房屋可编辑编码
+     */
+    private String coding;
+}

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

@@ -200,6 +200,34 @@ public class HouseController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * 信息登记，更新房屋信息
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author wgf
+     * @date 2022/8/3 11:16
+     */
+    @NoRepeatSubmit
+    @PostMapping("updateCollect")
+    public Result updateCollect(@RequestBody CollectHouseFormDTO formDTO) {
+        houseService.updateCollect(formDTO);
+        return new Result();
+    }
+
+    /**
+     * 获取房屋信息
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author wgf
+     * @date 2022/8/3 11:16
+     */
+    @PostMapping("getHouseInfoToCollect")
+    public Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO) {
+        return houseService.getHouseInfoToCollect(formDTO);
+    }
+
     /**
      * lzh
      *

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

@@ -2,6 +2,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
+import com.epmet.dto.form.GetHouseInfoToCollectFormDTO;
 import com.epmet.dto.form.IcHouseListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerOrgParameterEntity;
@@ -192,4 +193,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      * @params [coding]
      */
     IcHouseEntity selectByCoding(@Param("coding") String coding);
+
+    /**
+     * 获取房屋信息
+     * @param formDTO
+     * @return
+     */
+    IcHouseInfoCollectResultDTO getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
+
 }

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

@@ -43,6 +43,7 @@ public interface HouseService {
 
 
     void updateHouse(String customerId, IcHouseAddFormDTO formDTO);
+    void updateCollect(CollectHouseFormDTO formDTO);
 
     /**
      * Desc: 房屋变更记录
@@ -175,4 +176,11 @@ public interface HouseService {
     Result getHomeInfoByHouseCode(HouseInfoFormDTO dto);
 
     void orgIdPathInit();
+
+    /**
+     * 获取房屋信息
+     * @param formDTO
+     * @return
+     */
+    Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
 }

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

@@ -244,6 +244,24 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         icHouseRedis.delHouseInfo(formDTO.getHouseId(), customerId);
     }
 
+    /**
+     * 更新房屋（信息登记）
+     *
+     * @param
+     * @param formDTO
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateCollect(CollectHouseFormDTO formDTO) {
+        IcHouseEntity entity = new IcHouseEntity();
+        entity.setId(formDTO.getId());
+        entity.setRentFlag(formDTO.getRentFlag());
+        entity.setOwnerName(formDTO.getOwnerName());
+        icHouseDao.updateById(entity);
+        //删除房屋缓存
+        icHouseRedis.delHouseInfo(formDTO.getId(), entity.getCustomerId());
+    }
+
     /**
      * Desc: 房屋变更记录
      *
@@ -1220,4 +1238,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         }
         recureAppendParentAgencyId(pid, result);
     }
+
+
+    @Override
+    public Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO) {
+        IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = icHouseDao.getHouseInfoToCollect(formDTO);
+
+        return new Result<IcHouseInfoCollectResultDTO>().ok(icHouseInfoCollectResultDTO);
+    }
 }

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

@@ -541,5 +541,13 @@
               and CODING=#{coding}
     </select>
 
+    <select id="getHouseInfoToCollect" resultType="com.epmet.dto.result.IcHouseInfoCollectResultDTO">
+        select *
+        from ic_house
+        where del_flag = '0'
+        and BUILDING_UNIT_ID = #{buildingUnitId}
+        and DOOR_NAME = #{doorName}
+    </select>
+
 
 </mapper>

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

@@ -18,6 +18,12 @@ public class IcResiCollectCheckFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 新增标识(1:新增；2：修改)
+     */
+    @NotBlank(message = "新增标识不能为空")
+    private String addFlag;
+
     /**
      * 主键
      */
@@ -35,4 +41,30 @@ public class IcResiCollectCheckFormDTO implements Serializable {
      */
     private String checkReason;
 
+    /**
+     * 单元号
+     */
+    private String buildingUnitId;
+
+    /**
+     * 房间号
+     */
+    private String doorName;
+
+    // 修改房屋信息使用
+    /**
+     * 房屋ID
+     */
+    private String homeId;
+    /**
+     * 房屋状态1：出租 0：自住  2：闲置 3：未售出
+     */
+    private Integer rentFlag;
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+
+
+
 }

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

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 居民信息采集-获取房屋信息
+ *
+ * @author wgf
+ * @since v1.0.0 2022-08-02
+ */
+@Data
+public class IcResiCollectGetDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @NotBlank(message = "Id不能为空")
+	private String id;
+
+
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectHouseInfoResultDTO.java

@@ -0,0 +1,57 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author wgf
+ * @DateTime 2022/3/18 19:00
+ * @DESC
+ */
+@Data
+public class CollectHouseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6692672375850864451L;
+
+    /**
+     * label
+     */
+    private String label;
+
+    /**
+     * 所属小区id
+     */
+    private String neighborHoodId;
+
+    /**
+     * 所属小区姓名
+     */
+    private String neighborHoodName;
+
+    /**
+     * 所属楼栋id
+     */
+    private String buildingId;
+    /**
+     * 所属楼栋名称
+     */
+    private String buildName;
+    /**
+     * 所属单元id
+     */
+    private String buildingUnitId;
+    /**
+     * 所属单元名称
+     */
+    private String buildingUnitName;
+    /**
+     * 门牌号
+     */
+    private String doorName;
+    /**
+     * 房主姓名
+     */
+    private String ownerName;
+}

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

@@ -11,10 +11,7 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CollectListExcelResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.CollectListMemberExcelResultDTO;
-import com.epmet.dto.result.CollectListResultDTO;
-import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.service.IcResiCollectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -169,4 +166,15 @@ public class IcResiCollectController {
         return new Result();
     }
 
+    /**
+     * 信息采集-审核通过-新增房屋-复显房屋信息
+     * @param formDTO
+     * @param tokenDto
+     * @return
+     */
+    @PostMapping("getHouseDetailByCollect")
+    public Result<CollectHouseInfoResultDTO> getHouseDetailByCollect(@RequestBody IcResiCollectGetDetailFormDTO formDTO, @LoginUser TokenDto tokenDto) {
+        return new Result<CollectHouseInfoResultDTO>().ok(icResiCollectService.getHouseDetailByCollect(formDTO));
+    }
+
 }

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

@@ -2,6 +2,8 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.CollectListFormDTO;
+import com.epmet.dto.form.IcResiCollectGetDetailFormDTO;
+import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +45,11 @@ public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
      * @return
      */
     List<String> selectLastSubmitId(@Param("customerId") String customerId, @Param("userId") String userId);
-}
+
+    /**
+     * 获取房屋信息
+     * @param formDTO
+     * @return
+     */
+    CollectHouseInfoResultDTO getHouseDetailByCollect(IcResiCollectGetDetailFormDTO formDTO);
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@@ -3,11 +3,10 @@ package com.epmet.feign;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.OrgInfoPointFormDTO;
 import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
 import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -85,4 +84,24 @@ public interface GovOrgFeignClient {
     @GetMapping("/gov/org/customeragency/getCommunityInfoByUserId/{userId}")
     Result<CommunityInfoResultDTO> getCommunityInfoByUserId(@PathVariable("userId") String userId);
 
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 更新房屋新
+     * @Date 2020/4/26 23:16
+     **/
+    @PostMapping("/gov/org/house/updateCollect")
+    Result<CommunityInfoResultDTO> updateCollect(CollectHouseFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CommunityInfoResultDTO>
+     * @Author wgf
+     * @Description 获取房屋信息
+     * @Date 2020/4/26 23:16
+     **/
+    @PostMapping("/gov/org/house/getHouseInfoToCollect")
+    Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java

@@ -4,11 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.form.CommonGridIdFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.CustomerGridFormDTO;
-import com.epmet.dto.form.OrgInfoPointFormDTO;
 import com.epmet.dto.result.CommunityInfoResultDTO;
 import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
 import com.epmet.feign.GovOrgFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -51,4 +50,14 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient {
     public Result<CommunityInfoResultDTO> getCommunityInfoByUserId(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCommunityInfoByUserId",userId);
     }
+
+    @Override
+    public Result<CommunityInfoResultDTO> updateCollect(CollectHouseFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updateCollect",formDTO);
+    }
+
+    @Override
+    public Result<IcHouseInfoCollectResultDTO> getHouseInfoToCollect(GetHouseInfoToCollectFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHouseInfoToCollect",formDTO);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.entity.IcResiCollectEntity;
@@ -60,4 +61,11 @@ public interface IcResiCollectService extends BaseService<IcResiCollectEntity> {
      * @return
      */
     void collectCheck(IcResiCollectCheckFormDTO formDTO);
+
+    /**
+     * 信息采集-获取房屋信息
+     * @param formDTO
+     * @return
+     */
+    CollectHouseInfoResultDTO getHouseDetailByCollect(IcResiCollectGetDetailFormDTO formDTO);
 }

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

@@ -18,10 +18,13 @@ import com.epmet.dao.IcResiCollectDao;
 import com.epmet.dao.IcResiMemberDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.CollectHouseInfoResultDTO;
 import com.epmet.dto.result.CollectListResultDTO;
+import com.epmet.dto.result.IcHouseInfoCollectResultDTO;
 import com.epmet.dto.result.LatestCollectResDTO;
 import com.epmet.entity.IcResiCollectEntity;
 import com.epmet.entity.IcResiMemberEntity;
+import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.IcResiCollectService;
 import com.github.pagehelper.PageHelper;
@@ -52,6 +55,9 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     @Autowired
     private IcResiMemberDao icResiMemberDao;
 
+    @Autowired
+    private GovOrgFeignClient govOrgFeignClient;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcResiCollectFormDTO formDTO) {
@@ -266,6 +272,32 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         }else{
             // 通过
 
+            // fegin获取房屋信息
+            GetHouseInfoToCollectFormDTO getHouseInfoToCollectFormDTO = new GetHouseInfoToCollectFormDTO();
+            getHouseInfoToCollectFormDTO.setBuildingUnitId(formDTO.getBuildingUnitId());
+            getHouseInfoToCollectFormDTO.setDoorName(formDTO.getDoorName());
+            Result<IcHouseInfoCollectResultDTO> resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO);
+            IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData();
+
+            if("1".equals(formDTO.getAddFlag())){
+                // 新增房屋　( todo 需要collect更新上房屋ID)
+
+
+            }else{
+                // 更新房屋
+                CollectHouseFormDTO collectHouseFormDTO = new CollectHouseFormDTO();
+                collectHouseFormDTO.setId(formDTO.getHomeId());
+                collectHouseFormDTO.setOwnerName(formDTO.getOwnerName());
+                collectHouseFormDTO.setRentFlag(formDTO.getRentFlag());
+                govOrgFeignClient.updateCollect(collectHouseFormDTO);
+
+                // 获取登记的成员
+
+
+
+
+            }
+
 
 
         }
@@ -273,4 +305,12 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
 
     }
+
+    @Override
+    public CollectHouseInfoResultDTO getHouseDetailByCollect(IcResiCollectGetDetailFormDTO formDTO) {
+
+        CollectHouseInfoResultDTO collectHouseInfoResultDTO = baseDao.getHouseDetailByCollect(formDTO);
+
+        return collectHouseInfoResultDTO;
+    }
 }

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

@@ -104,4 +104,21 @@
         ORDER BY
             m.UPDATED_TIME DESC
     </select>
+
+    <select id="getHouseDetailByCollect" resultType="com.epmet.dto.result.CollectHouseInfoResultDTO"
+            parameterType="com.epmet.dto.form.IcResiCollectGetDetailFormDTO">
+        select
+            concat(VILLAGE_NAME,'-',BUILD_NAME) label,
+            VILLAGE_ID as neighborHoodId,
+            VILLAGE_NAME as neighborHoodName,
+            BUILD_ID as buildingId,
+            BUILD_NAME as buildName,
+            UNIT_ID as buildingUnitId,
+            UNIT_NAME as buildingUnitName,
+            HOME_NAME as doorName,
+            HOUSE_HOLDER_NAME as ownerName
+        from ic_resi_collect
+        where DEL_FLAG = 0
+        and ID = #{id}
+    </select>
 </mapper>