From 8a92034aecec3eece4d2498e91bcd73eb70988d7 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 11 Apr 2023 15:15:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=94=BB=E5=83=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseCountPictureFormDTO.java | 4 +++ .../result/HouseCountPictureResultDTO.java | 18 +++++++--- .../dto/result/HousePictureListResultDTO.java | 33 +++++++++++++++++ .../epmet/controller/IcHouseController.java | 28 ++++++++++----- .../main/java/com/epmet/dao/IcHouseDao.java | 4 +-- .../com/epmet/service/IcHouseService.java | 6 ++-- .../service/impl/IcHouseServiceImpl.java | 35 ++++++++++++++++--- 7 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java index 77d7201a25..8abe03ed70 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseCountPictureFormDTO.java +++ b/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; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java index ef9edb5adc..b5dadea13a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseCountPictureResultDTO.java +++ b/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 - * @Author zhaoqifeng - * @Date 2021/11/5 15:59 + * @Description: + * @Author: lichao + * @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 list; + + @Data + public static class HouseCountPictureCount{ + + private String type; + + private Integer count; + } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousePictureListResultDTO.java new file mode 100644 index 0000000000..9bc481c068 --- /dev/null +++ b/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; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 69eb81e2cd..4459e958b3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/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> + * @Return com.epmet.commons.tools.utils.Result * @Author: lichao - * @Date: 2023/4/11 10:35 + * @Date: 2023/4/11 15:08 */ @PostMapping("getHousePurposeCount") - public Result> getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){ - return new Result>().ok(icHouseService.getHousePurposeCount(dto)); + public Result getHousePurposeCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result().ok(icHouseService.getHousePurposeCount(dto)); } /** - * @Description: 房屋画像-用途统计 + * @Description: 房屋画像-状态统计 * @param dto: - * @Return com.epmet.commons.tools.utils.Result> + * @Return com.epmet.commons.tools.utils.Result * @Author: lichao - * @Date: 2023/4/11 10:41 + * @Date: 2023/4/11 15:07 */ @PostMapping("getHouseStatusCount") - public Result> getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){ - return new Result>().ok(icHouseService.getHouseStatusCount(dto)); + public Result getHouseStatusCount(@RequestBody HouseCountPictureFormDTO dto){ + return new Result().ok(icHouseService.getHouseStatusCount(dto)); + } + + /** + * 房屋画像-列表 + * @param dto + * @return + */ + @PostMapping("getHousePictureList") + public Result> getHousePictureList(@RequestBody HouseCountPictureFormDTO dto){ + return new Result>().ok(icHouseService.getHousePictureList(dto)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index e771af793e..0937f3c23f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -220,7 +220,7 @@ public interface IcHouseDao extends BaseDao { */ List selectGroupRentHouseList(GroupRentHouseFormDTO formDTO); - List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHousePurposeCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + List getHouseStatusCount(@Param("orgId") String orgId, @Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 4f431e77bf..09b1c4799e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -140,7 +140,9 @@ public interface IcHouseService extends BaseService { Result checkHomeInfo(CheckHouseInfoFormDTO formDTO); - List getHousePurposeCount(HouseCountPictureFormDTO dto); + HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto); - List getHouseStatusCount(HouseCountPictureFormDTO dto); + HouseCountPictureResultDTO getHouseStatusCount(HouseCountPictureFormDTO dto); + + List getHousePictureList(HouseCountPictureFormDTO dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index e88b9fe522..307eb63149 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/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 getHousePurposeCount(HouseCountPictureFormDTO dto) { - return baseDao.getHousePurposeCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + public HouseCountPictureResultDTO getHousePurposeCount(HouseCountPictureFormDTO dto) { + + 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 getHouseStatusCount(HouseCountPictureFormDTO dto) { - return baseDao.getHouseStatusCount(dto.getOrgIdPath(),dto.getTimeStart(),dto.getTimeEnd()); + public List getHousePictureList(HouseCountPictureFormDTO dto) { + return null; } }