diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeStatisticsResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeStatisticsResultDTO.java new file mode 100644 index 0000000000..cf665561a1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeStatisticsResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description 街道房屋统计 + * @Author lc + * @Date + */ +@NoArgsConstructor +@Data +public class HouseStreeStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = -1098032063828430218L; + private String streeId; + private String name; + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeTypeStatisticsResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeTypeStatisticsResultDTO.java new file mode 100644 index 0000000000..0517fc790f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseStreeTypeStatisticsResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description 街道房屋 类型 统计 + * @Author lc + * @Date + */ +@NoArgsConstructor +@Data +public class HouseStreeTypeStatisticsResultDTO implements Serializable { + private static final long serialVersionUID = -1098032063828430218L; + private String type; + private String typeName; + private Integer count; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 8066bfa560..f6a889d348 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -666,4 +666,30 @@ public class HouseController implements ResultDataResolver { return new Result().ok(result); } + /** + * @Description: 获取大屏街道统计 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/4 13:58 + */ + @GetMapping("screen/getStreeHouseStatistics") + public Result> getStreeHouseStatistics() { + List result = houseService.getStreeHouseStatistics(); + return new Result>().ok(result); + } + + /** + * @Description: 获取大屏街道 类型 统计 + * @param : streetId + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/4 13:58 + */ + @GetMapping("screen/getStreeHouseTypeStatistics") + public Result> getStreeHouseTypeStatistics(String streetId) { + List result = houseService.getStreeHouseTypeStatistics(streetId); + return new Result>().ok(result); + } + } 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 fb117b1280..09cfad4716 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 @@ -204,4 +204,6 @@ public interface IcHouseDao extends BaseDao { List getMicroGridHouseList(@Param("microGridId") String microGridId); String getMicroGridHouseName(@Param("id") String levelId); + + List getStreeHouseTypeStatistics(@Param("pids") String pids); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index dc2d378e1d..ad173ce0a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -201,4 +201,8 @@ public interface HouseService { boolean removeMicroGridHouse(HouseRemoveMicroGridFormDTO dto); String getMicroGridHouseName(String levelId, String level); + + List getStreeHouseStatistics(); + + List getStreeHouseTypeStatistics(String streetId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 43bb6c0448..4df6ea7d98 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1360,4 +1360,47 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } return result; } + + @Override + public List getStreeHouseStatistics() { + + List result = new ArrayList<>(); + + LambdaQueryWrapper agencyEntityLambdaQueryWrapper + = new LambdaQueryWrapper().eq(CustomerAgencyEntity::getLevel,"street"); + List streetList = customerAgencyDao.selectList(agencyEntityLambdaQueryWrapper); + +// Map streetMaps = streetList.stream().collect(Collectors.toMap(CustomerAgencyEntity::getId,entity->entity)); +// List streetIds = streetList.stream().map(street->street.getPids()+street.getId()).collect(Collectors.toList()); + + streetList.forEach( + street -> { + HouseStreeStatisticsResultDTO houseStreeStatisticsResultDTO = new HouseStreeStatisticsResultDTO(); + + LambdaQueryWrapper houseEntityLambdaQueryWrapper + = new LambdaQueryWrapper().likeRight(IcHouseEntity::getOrgIdPath, street.getPids()+ ":" + street.getId()); + List houseEntities = icHouseDao.selectList(houseEntityLambdaQueryWrapper); + houseStreeStatisticsResultDTO.setName(street.getOrganizationName()); + houseStreeStatisticsResultDTO.setStreeId(street.getId()); + houseStreeStatisticsResultDTO.setCount(houseEntities.size()); + result.add(houseStreeStatisticsResultDTO); + }); + return result; + } + + @Override + public List getStreeHouseTypeStatistics(String streetId) { + + + List result = new ArrayList<>(); + + CustomerAgencyEntity street = customerAgencyDao.selectById(streetId); + + if (street!=null){ + result = icHouseDao.getStreeHouseTypeStatistics(street.getPids() +":"+ street.getId()); + }else{ + throw new EpmetException("未查询到街道"+streetId); + } + return result; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index bda1b7e357..6e21489b13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -567,6 +567,14 @@ house.id = #{id} +