From a7722fdab1d8935668e2f7035a852d2d04738ee6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 24 Jun 2022 16:45:20 +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=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E5=88=86=E9=A1=B5=EF=BC=8C=E5=88=99=E5=8F=AA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=88=AB=E5=92=8C=E5=9D=90=E6=A0=87?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E8=BF=94=E5=9B=9E=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E7=9A=84name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 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 e83db193ad..94ff39aef4 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 @@ -292,7 +292,8 @@ public class CoverageServiceImpl implements CoverageService { buildingLongitude = resiBuilding.getLongitude(); } return new CoverageAnalisisDataListResultDTO( - re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); + re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null, + buildingLatitude, buildingLongitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { @@ -309,7 +310,8 @@ public class CoverageServiceImpl implements CoverageService { buildingLongitude = resiBuilding.getLongitude(); } return new CoverageAnalisisDataListResultDTO( - re.getId(), categoryKey, categoryDict.getCategoryName(), placeType, re.getName(), buildingLatitude, buildingLongitude); + re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + isPage ? re.getName() : null, buildingLatitude, buildingLongitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_EVENT.equals(placeType)) { @@ -319,7 +321,8 @@ public class CoverageServiceImpl implements CoverageService { return icEventEntities.stream() .map(e -> new CoverageAnalisisDataListResultDTO( - e.getId(), categoryKey, categoryDict.getCategoryName(), placeType, e.getName(), e.getLatitude(), e.getLongitude())) + e.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? e.getName() : null, + e.getLatitude(), e.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { @@ -328,7 +331,8 @@ public class CoverageServiceImpl implements CoverageService { customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return cityResources.stream() .map(resource -> new CoverageAnalisisDataListResultDTO( - resource.getId(), categoryKey, categoryDict.getCategoryName(), placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) + resource.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + isPage ? resource.getName() : null, resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { @@ -338,7 +342,8 @@ public class CoverageServiceImpl implements CoverageService { return l.stream() .map(org -> new CoverageAnalisisDataListResultDTO( - org.getId(), categoryKey, categoryDict.getCategoryName(), placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) + org.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + isPage ? org.getOrganizationName() : null, org.getLatitude(), org.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { @@ -349,7 +354,8 @@ public class CoverageServiceImpl implements CoverageService { customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); return l.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude())) + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getUnitName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>(); @@ -359,7 +365,8 @@ public class CoverageServiceImpl implements CoverageService { customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { @@ -368,7 +375,8 @@ public class CoverageServiceImpl implements CoverageService { customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return list.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getPlaceOrgName(), dc.getLatitude(), dc.getLongitude())) + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getPatrolId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { @@ -383,7 +391,8 @@ public class CoverageServiceImpl implements CoverageService { longitude = buildingInfo.getLongitude(); } String houseName = StringUtils.isNotBlank(h.getFullName()) ? h.getFullName() : h.getHouseName(); - return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, categoryDict.getCategoryName(), placeType, houseName, latitude, longitude); + return new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? houseName : null, latitude, longitude); }).collect(Collectors.toList()); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { @@ -391,14 +400,16 @@ public class CoverageServiceImpl implements CoverageService { List l = orgCoverageService.searchPublicServiceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { // 优势资源 List l = orgCoverageService.searchSuporiorResourceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, categoryDict.getCategoryName(), placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>();