elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【五大图层】数据查询，如果不分页，则只返回类别和坐标数据，不返回相应的name

feature/teamB_zz_wgh
wangxianzhang 3 years ago
parent
e4366a51c8
commit
a7722fdab1
1 changed files with 22 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

33
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
View File

@ -292,7 +292,8 @@ public class CoverageServiceImpl implements CoverageService {
buildingLongitude = resiBuilding.getLongitude(); buildingLongitude = resiBuilding.getLongitude();
} }
return new CoverageAnalisisDataListResultDTO( 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()); }).collect(Collectors.toList());
} else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
@ -309,7 +310,8 @@ public class CoverageServiceImpl implements CoverageService {
buildingLongitude = resiBuilding.getLongitude(); buildingLongitude = resiBuilding.getLongitude();
} }
return new CoverageAnalisisDataListResultDTO( 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()); }).collect(Collectors.toList());
} else if (PLACE_TYPE_EVENT.equals(placeType)) { } else if (PLACE_TYPE_EVENT.equals(placeType)) {
@ -319,7 +321,8 @@ public class CoverageServiceImpl implements CoverageService {
return icEventEntities.stream() return icEventEntities.stream()
.map(e -> new CoverageAnalisisDataListResultDTO( .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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) {
@ -328,7 +331,8 @@ public class CoverageServiceImpl implements CoverageService {
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return cityResources.stream() return cityResources.stream()
.map(resource -> new CoverageAnalisisDataListResultDTO( .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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) {
@ -338,7 +342,8 @@ public class CoverageServiceImpl implements CoverageService {
return l.stream() return l.stream()
.map(org -> new CoverageAnalisisDataListResultDTO( .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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { } 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); customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize);
return l.stream() 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()); .collect(Collectors.toList());
} }
return new ArrayList<>(); return new ArrayList<>();
@ -359,7 +365,8 @@ public class CoverageServiceImpl implements CoverageService {
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream() 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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { } 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); customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return list.stream() 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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
@ -383,7 +391,8 @@ public class CoverageServiceImpl implements CoverageService {
longitude = buildingInfo.getLongitude(); longitude = buildingInfo.getLongitude();
} }
String houseName = StringUtils.isNotBlank(h.getFullName()) ? h.getFullName() : h.getHouseName(); 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()); }).collect(Collectors.toList());
} else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
@ -391,14 +400,16 @@ public class CoverageServiceImpl implements CoverageService {
List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities( List<IcPublicServiceEntity> l = orgCoverageService.searchPublicServiceEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream() 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()); .collect(Collectors.toList());
} else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) {
// 优势资源 // 优势资源
List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities( List<IcSuperiorResourceEntity> l = orgCoverageService.searchSuporiorResourceEntities(
customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize);
return l.stream() 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()); .collect(Collectors.toList());
} }
return new ArrayList<>(); return new ArrayList<>();

Write Preview
Loading…
Cancel
Save