From 3a000e56fd4968b83f0c6e3947c1bd8dbd4b03e2 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 18 May 2023 16:10:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=9A=84=E7=BB=8F=E7=BA=AC=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingshan/LingShanSpecialCrowdStatsByOrgResultDTO.java | 2 ++ .../com/epmet/service/impl/LingShanScreenServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingShanSpecialCrowdStatsByOrgResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingShanSpecialCrowdStatsByOrgResultDTO.java index 726bd63450..f5b0ba1cea 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingShanSpecialCrowdStatsByOrgResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/lingshan/LingShanSpecialCrowdStatsByOrgResultDTO.java @@ -21,5 +21,7 @@ public class LingShanSpecialCrowdStatsByOrgResultDTO { */ private Integer quantity = 0; + private String longitude; + private String latitude; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java index fc2912ebb6..6346505e91 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.PidUtils; import com.epmet.constant.LevelConstant; import com.epmet.dao.*; @@ -51,9 +52,14 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD List rl = subOrgs.stream().map(sub -> { LingShanSpecialCrowdStatsByOrgResultDTO t = new LingShanSpecialCrowdStatsByOrgResultDTO(); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(sub.getOrgId()); t.setOrgId(sub.getOrgId()); t.setOrgName(sub.getOrgName()); t.setOrgType(sub.getOrgType()); + if (agencyInfo != null) { + t.setLongitude(agencyInfo.getLongitude()); + t.setLatitude(agencyInfo.getLatitude()); + } t.setOrgIdPath(PidUtils.convertPid2OrgIdPath(sub.getOrgId(), sub.getPids())); return t; }).collect(Collectors.toList());