From 1d37a39f18202b5ceb7727a104eeb32f931dc77d Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 30 Aug 2022 09:37:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/BuildingResultDTO.java | 4 ++++ .../src/main/resources/mapper/IcBuildingDao.xml | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index dc2624e160..14e9e05aa0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -28,4 +28,8 @@ public class BuildingResultDTO implements Serializable { private String label; + private String allParentName; + + private String agencyName; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 8d8cc4535e..0b71b79176 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -458,15 +458,19 @@ n.id AS neighborhoodId, n.NEIGHBOR_HOOD_NAME AS neighborhoodName, n.GRID_ID, - g.GRID_NAME + g.GRID_NAME, + a.ALL_PARENT_NAME, + a.ORGANIZATION_NAME AS AGENCY_NAME FROM ic_building b LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id LEFT JOIN customer_grid g ON n.GRID_ID = g.id + LEFT JOIN customer_agency a ON a.id = g.pid WHERE n.DEL_FLAG = '0' AND b.DEL_FLAG = '0' AND g.DEL_FLAG = '0' + AND a.DEL_FLAG = '0' AND n.CUSTOMER_ID = #{customerId} AND n.GRID_ID = #{gridId} From da859762b9cf7dc75f7410313280122f88723f0f Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 30 Aug 2022 10:38:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 3ca505d172..046b58156d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -191,7 +191,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 10:44:35 +0800 Subject: [PATCH 3/5] bug --- .../java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 046b58156d..71f15a0fe4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -191,7 +191,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 11:02:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcNeighborHoodServiceImpl.java | 18 +++++++++--------- .../main/resources/mapper/IcBuildingDao.xml | 8 +++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 71f15a0fe4..66658f83f2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -214,15 +214,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl getNeighborhoodList(TokenDto tokenDto, IcNeighborHoodDTO dto) { dto.setCustomerId(tokenDto.getCustomerId()); - if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { - log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); - CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - if (null == result || StringUtils.isBlank(result.getAgencyId())) { - log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId())); - return Collections.emptyList(); - } - dto.setAgencyId(result.getAgencyId()); - } +// if (StringUtils.isBlank(dto.getAgencyId()) && StringUtils.isEmpty(dto.getGridId())) { +// log.info("agencyId与gridId都为空时，默认查询当前工作人员所属组织下的小区"); +// CustomerStaffInfoCacheResult result= CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); +// if (null == result || StringUtils.isBlank(result.getAgencyId())) { +// log.error(String.format("staffId:%s,工作人员缓存信息查询异常", tokenDto.getUserId())); +// return Collections.emptyList(); +// } +// dto.setAgencyId(result.getAgencyId()); +// } return icBuildingDao.listBuildingInfo(dto); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 0b71b79176..a5e3001d28 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -478,9 +478,11 @@ AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%')) - AND ( - n.AGENCY_ID = #{agencyId} - OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) + + AND ( + n.AGENCY_ID = #{agencyId} + OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) + From e8d3a2aa3db67dd192bdc58dc49825076d617a78 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 30 Aug 2022 15:05:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=AE=A2=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/result/BuildingResultDTO.java | 2 ++ .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java index 14e9e05aa0..63b6235605 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BuildingResultDTO.java @@ -32,4 +32,6 @@ public class BuildingResultDTO implements Serializable { private String agencyName; + private String customerId; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index a5e3001d28..02f4b8104d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -460,7 +460,8 @@ n.GRID_ID, g.GRID_NAME, a.ALL_PARENT_NAME, - a.ORGANIZATION_NAME AS AGENCY_NAME + a.ORGANIZATION_NAME AS AGENCY_NAME, + n.CUSTOMER_ID FROM ic_building b LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id