房屋画像修改

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

@@ -19,4 +19,8 @@ public class HouseCountPictureFormDTO implements Serializable {
     private Date timeStart;
 
     private Date timeEnd;
+
+    private Integer pageSize;
+
+    private Integer pageNo;
 }

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

@@ -7,9 +7,9 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * @Description
+ * @Description:
- * @Author zhaoqifeng
+ * @Author: lichao
- * @Date 2021/11/5 15:59
+ * @Date: 2023/4/11 15:05
  */
 @NoArgsConstructor
 @Data
@@ -17,7 +17,15 @@ public class HouseCountPictureResultDTO implements Serializable {
 
     private static final long serialVersionUID = 2063032844842070847L;
 
-    private String type;
+    private Integer total;
 
-    private Integer count;
+    private List<HouseCountPictureCount> list;
+
+    @Data
+    public static class HouseCountPictureCount{
+
+        private String type;
+
+        private Integer count;
+    }
 }

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

@@ -0,0 +1,33 @@
+package com.epmet.dto.result;
+
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: lichao
+ * @Date: 2023/4/11 14:41
+ */
+@NoArgsConstructor
+@Data
+public class HousePictureListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 2063032844842070847L;
+
+    private String houseId;
+
+    private String districtName;
+
+    private String neighborName;
+
+    private String gridName;
+
+    private String houseName;
+
+    private String purpose;
+
+    private Integer rentFlag;
+}

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

@@ -162,25 +162,35 @@ public class IcHouseController {
     /**
      * @Description: 房屋画像-用途统计
      * @param dto:
-     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HouseCountPictureResultDTO>>
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseCountPictureResultDTO>
      * @Author: lichao
-     * @Date: 2023/4/11 10:35
+     * @Date: 2023/4/11 15:08
      */
     @PostMapping("getHousePurposeCount")
-    public Result<List<HouseCountPictureResultDTO>> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){
+    public Result<HouseCountPictureResultDTO> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){
-        return new Result<List<HouseCountPictureResultDTO>>().ok(icHouseService.getHousePurposeCount(dto));
+        return new Result<HouseCountPictureResultDTO>().ok(icHouseService.getHousePurposeCount(dto));
     }
 
 
     /**
-     * @Description: 房屋画像-用途统计
+     * @Description: 房屋画像-状态统计
      * @param dto:
-     * @Return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.HouseCountPictureResultDTO>>
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HouseCountPictureResultDTO>
      * @Author: lichao
-     * @Date: 2023/4/11 10:41
+     * @Date: 2023/4/11 15:07
      */
     @PostMapping("getHouseStatusCount")
-    public Result<List<HouseCountPictureResultDTO>> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){
+    public Result<HouseCountPictureResultDTO> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){
-        return new Result<List<HouseCountPictureResultDTO>>().ok(icHouseService.getHouseStatusCount(dto));
+        return new Result<HouseCountPictureResultDTO>().ok(icHouseService.getHouseStatusCount(dto));
+    }
+
+    /**
+     * 房屋画像-列表
+     * @param dto
+     * @return
+     */
+    @PostMapping("getHousePictureList")
+    public Result<List<HousePictureListResultDTO>> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){
+        return new Result<List<HousePictureListResultDTO>>().ok(icHouseService.getHousePictureList(dto));
     }
 }

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

@@ -220,7 +220,7 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<GroupRentHouseResultDTO> selectGroupRentHouseList(GroupRentHouseFormDTO formDTO);
 
-    List<HouseCountPictureResultDTO> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
+    List<HouseCountPictureResultDTO.HouseCountPictureCount> getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 
-    List<HouseCountPictureResultDTO> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
+    List<HouseCountPictureResultDTO.HouseCountPictureCount> getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd);
 }

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

@@ -140,7 +140,9 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
     Result checkHomeInfo(CheckHouseInfoFormDTO formDTO);
 
 
-    List<HouseCountPictureResultDTO> getHousePurposeCount(HouseCountPictureFormDTO dto);
+    HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto);
 
-    List<HouseCountPictureResultDTO> getHouseStatusCount(HouseCountPictureFormDTO dto);
+    HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto);
+
+    List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto);
 }

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

@@ -408,12 +408,39 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     }
 
     @Override
-    public List<HouseCountPictureResultDTO> getHousePurposeCount(HouseCountPictureFormDTO dto) {
+    public HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto) {
-        return baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd());
+
+        HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
+
+        resultDTO.setTotal(0);
+
+        resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()));
+
+        resultDTO.getList().forEach(
+                result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
+        );
+
+        return resultDTO;
+    }
+
+    @Override
+    public HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto) {
+
+        HouseCountPictureResultDTO resultDTO = new HouseCountPictureResultDTO();
+
+        resultDTO.setTotal(0);
+
+        resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()));
+
+        resultDTO.getList().forEach(
+                result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount())
+        );
+
+        return resultDTO;
     }
 
     @Override
-    public List<HouseCountPictureResultDTO> getHouseStatusCount(HouseCountPictureFormDTO dto) {
+    public List<HousePictureListResultDTO> getHousePictureList(HouseCountPictureFormDTO dto) {
-        return baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd());
+        return null;
     }
 }