From 8e35cc20bf0dc05d97ecf587f79d31f254d1736b Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Thu, 23 Jun 2022 10:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E3=80=91=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E6=8F=90=E9=AB=98=E6=95=88=E7=8E=87?=
 =?UTF-8?q?=EF=BC=9B/resi-brief=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=BA=E6=88=B7=E7=8A=B6=E5=86=B5=E5=92=8C=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/service/impl/CoverageServiceImpl.java      | 7 ++++---
 .../java/com/epmet/dto/result/IcResiUserBriefDTO.java    | 9 +++++++++
 .../com/epmet/service/impl/IcResiUserServiceImpl.java    | 2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

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<IcResiUserEntity> 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<IcResiInfoResultDTO> 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<IcHouseEntity> 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<HouseUserDTO> 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<IcResiUserDao, IcResi
         r.setHouseId(resiEntity.getHomeId());
         r.setIcResiUserId(resiEntity.getId());
         r.setIcUserName(resiEntity.getName());
+        r.setRhzk(resiEntity.getRhzk());
+        r.setGzdw(resiEntity.getGzdw());
 
         // 填充网格、小区名称
         String errorMsg = "【居民信息简介】查询网格、小区信息失败";