【五大图层】查询数据列表多线程提高效率；/resi-brief接口增加人户状况和工作单位的字段

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;

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;
 }

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 = "【居民信息简介】查询网格、小区信息失败";