diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 890665efe0..604b46dda8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -276,7 +276,7 @@ public class CoverageServiceImpl implements CoverageService { List resiEntities = icResiService.listResisByCategories4Coverage( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); - return resiEntities.stream().map(re -> { + return resiEntities.parallelStream().map(re -> { // 使用楼栋的坐标补充居民的坐标信息 BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); String buildingLatitude = null; @@ -285,6 +285,7 @@ public class CoverageServiceImpl implements CoverageService { buildingLatitude = resiBuilding.getLatitude(); buildingLongitude = resiBuilding.getLongitude(); } + log.info("hhh"); return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); @@ -294,7 +295,7 @@ public class CoverageServiceImpl implements CoverageService { List resiInfos = icResiService.listSpecialResisBySpecialType( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); - return resiInfos.stream().map(re -> { + return resiInfos.parallelStream().map(re -> { BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId()); String buildingLatitude = null; String buildingLongitude = null; @@ -368,7 +369,7 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋,住的人口超过5人属于群租房(是个规定 List houses = orgCoverageService.searchByResiNumber(customerId, staffOrgIds, search, 5, isPage, pageNo, pageSize); - return houses.stream().map(h -> { + return houses.parallelStream().map(h -> { BuildingInfoCache buildingInfo = govOrgService.queryBuildingInfo(h.getBuildingId()); String latitude = null; String longitude = null; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 056acbc584..c9a0160aed 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -76,4 +76,13 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { */ private List houseUserList; + /** + * 人户状况 + */ + private String rhzk; + + /** + * 工作单位 + */ + private String gzdw; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 51abe39977..decd30dfc6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1412,6 +1412,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl