From 2ebbe7fa039b32c2f8707cfc0e93fbfa8c0734c7 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 30 May 2023 16:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E3=80=90=E7=A4=BE?= =?UTF-8?q?=E4=BC=9A=E6=9C=8D=E5=8A=A1=E8=B5=84=E6=BA=90=E3=80=91=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eenPublicServicePlaceListByCateRstDTO.java | 4 ++ .../controller/IcPublicServiceController.java | 2 +- .../impl/IcPublicServiceServiceImpl.java | 43 ++++++++++++++++++- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java index 309c680647..07c2951e32 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingShanScreenPublicServicePlaceListByCateRstDTO.java @@ -1,8 +1,12 @@ package com.epmet.dto.result.lingshan; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@NoArgsConstructor +@AllArgsConstructor public class LingShanScreenPublicServicePlaceListByCateRstDTO { /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java index 8f18b6d5c4..f91c00427b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPublicServiceController.java @@ -259,7 +259,7 @@ public class IcPublicServiceController implements ResultDataResolver { @GetMapping("lingshan/screen/listByCategory") public Result> lingshanScreenListByCategory(@RequestParam("orgType") String orgType, @RequestParam("orgId") String orgId, - @RequestParam("category") String category) { + @RequestParam(value = "category", required = false) String category) { List rl = icPublicServiceService.lingshanScreenListByCategory(orgId, orgType, category); return new Result>().ok(rl); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java index fc149d7d9c..cbfee363be 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java @@ -18,6 +18,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.*; import com.epmet.constant.OrgInfoConstant; import com.epmet.constants.ImportTaskConstants; +import com.epmet.dao.IcCoverageCategoryDictDao; import com.epmet.dao.IcPublicServiceDao; import com.epmet.dto.IcPublicServiceDTO; import com.epmet.dto.form.IcPublicServiceAddEditFormDTO; @@ -61,6 +62,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -87,6 +89,9 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl lingshanScreenListByCategory(String orgId, String orgType, String category) { + String orgIdPath; + if (StringUtils.isAnyBlank(orgType, orgId)) { + orgIdPath = userRemoteService.getLoginUserDetails().getOrgIdPath(); + } else { + if (OrgInfoConstant.AGENCY.equals(orgType)) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()); + } else { + return new ArrayList<>(); + } + } + + // 查询类别，并且转化为字典，备用 + Map categoryAndObj = + coverageCategoryDictDao.dictMap(EpmetRequestHolder.getLoginUserCustomerId(), "public_service") + .stream() + .collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, Function.identity())); + + // 查询数据，并且填充内容，返回前端 + LambdaQueryWrapper q = new LambdaQueryWrapper<>(); + q.eq(IcPublicServiceEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + q.eq(StringUtils.isNotBlank(category), IcPublicServiceEntity::getCategory, category); + q.likeRight(IcPublicServiceEntity::getAgencyIdPath, orgIdPath); + return baseDao.selectList(q).stream().map(e -> { + String griderName = null; + String griderPhone = null; + if (org.apache.commons.lang.StringUtils.isNotBlank(e.getGriderId())) { + CustomerStaffInfoCacheResult griderInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), e.getGriderId()); + if (griderInfo != null) { + griderName = griderInfo.getRealName(); + griderPhone = griderInfo.getMobile(); + } + } - return null; + return new LingShanScreenPublicServicePlaceListByCateRstDTO( + e.getName(), categoryAndObj.get(e.getCategory()).getLabel(), e.getLongitude(), e.getLatitude(), e.getAddress(), + e.getPrincipal(), e.getMobile(), e.getPoliceName(), e.getPolicePhone(), griderName, griderPhone); + }).collect(Collectors.toList()); } } \ No newline at end of file