From f0789681174d5c919f5ceb10137d3b39ffabbb1a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 21 Jun 2022 12:16:18 +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=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcPublicServiceDao.java | 15 +++ .../dao/govorg/IcSuperiorResourceDao.java | 16 +++ .../dataaggre/dao/heart/IcPartyUnitDao.java | 33 ++++++ .../entity/govorg/IcPublicServiceEntity.java | 76 ++++++++++++ .../govorg/IcSuperiorResourceEntity.java | 76 ++++++++++++ .../entity/heart/IcPartyUnitEntity.java | 108 ++++++++++++++++++ .../service/govorg/GovOrgCoverageService.java | 44 +++++-- .../impl/GovOrgCoverageServiceImpl.java | 76 +++++++++--- .../dataaggre/service/heart/HeartService.java | 21 +++- .../service/heart/impl/HeartServiceImpl.java | 43 ++++++- .../service/impl/CoverageServiceImpl.java | 49 +++++--- .../mapper/govorg/IcPublicServiceDao.xml | 6 + .../mapper/govorg/IcSuperiorResourceDao.xml | 7 ++ .../resources/mapper/heart/IcPartyUnitDao.xml | 6 + 14 files changed, 532 insertions(+), 44 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcPublicServiceDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcSuperiorResourceDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcPartyUnitDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcSuperiorResourceEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcPartyUnitEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcPublicServiceDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcSuperiorResourceDao.xml create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcPartyUnitDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcPublicServiceDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcPublicServiceDao.java new file mode 100644 index 0000000000..cfa9135827 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcPublicServiceDao.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcPublicServiceEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcPublicServiceDao extends BaseDao { +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcSuperiorResourceDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcSuperiorResourceDao.java new file mode 100644 index 0000000000..9324e8fd1b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcSuperiorResourceDao.java @@ -0,0 +1,16 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.govorg.IcSuperiorResourceEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface IcSuperiorResourceDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcPartyUnitDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcPartyUnitDao.java new file mode 100644 index 0000000000..5a45b5e977 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcPartyUnitDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dao.heart; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 联建单位 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-19 + */ +@Mapper +public interface IcPartyUnitDao extends BaseDao { + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java new file mode 100644 index 0000000000..6a454c446b --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java @@ -0,0 +1,76 @@ +package com.epmet.dataaggre.entity.govorg; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 公共服务图层 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_public_service") +public class IcPublicServiceEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:public_service】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcSuperiorResourceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcSuperiorResourceEntity.java new file mode 100644 index 0000000000..d1af8c2fa5 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcSuperiorResourceEntity.java @@ -0,0 +1,76 @@ +package com.epmet.dataaggre.entity.govorg; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 优势资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_superior_resource") +public class IcSuperiorResourceEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 来源【新增:add 导入:import 】 + */ + private String sourceType; + + /** + * 场所名称 + */ + private String name; + + /** + * 场所分类【字典表ic_coverage_category_dict key:superior_resource】 + */ + private String category; + + /** + * 占地面积，单位平方公里 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private Integer capacity; + + /** + * 地址 + */ + private String address; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcPartyUnitEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcPartyUnitEntity.java new file mode 100644 index 0000000000..49fea93e34 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/heart/IcPartyUnitEntity.java @@ -0,0 +1,108 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.entity.heart; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 联建单位 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-11-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_unit") +public class IcPartyUnitEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * + */ + private String pids; + + /** + * 单位名称 + */ + private String unitName; + + /** + * 分类 楼宇党建 两新组织 区域单位党建 机关直属部门 其他 + */ + private String type; + + /** + * 服务事项 多选逗号隔开 + */ + private String serviceMatter; + + /** + * 联系人 + */ + private String contact; + + /** + * 联系电话 + */ + private String contactMobile; + + /** + * 在职党员数 + */ + private Integer memberCount; + + /** + * 地址 + */ + private String address; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + /** + * 群众满意度 + */ + private String satisfaction; + + /** + * 备注 + */ + private String remark; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 7549b7f76f..cf9bbec696 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -1,8 +1,6 @@ package com.epmet.dataaggre.service.govorg; -import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; -import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import lombok.AllArgsConstructor; import lombok.Data; @@ -31,14 +29,14 @@ public interface GovOrgCoverageService { * @param categoryKeys * @return */ - Map> getMappingRelationByCategoryKey(List categoryKeys); + Map> getMappingRelationByCategoryKey(List categoryKeys, String customerId); /** * 根据coverageTypes分类key列表，查询他们和图层时间的关系，映射为一个map * @param coverageTypes * @return */ - Map> getMappingRelationByCoverageType(List coverageTypes); + Map> getMappingRelationByCoverageType(List coverageTypes, String customerId); /** * 搜索城市资源 @@ -50,7 +48,7 @@ public interface GovOrgCoverageService { * @param pageSize * @return */ - List searchCityResourceEntities(String customerId, String agencyIdPath, String search, Boolean isPage, + List searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize); /** @@ -63,8 +61,8 @@ public interface GovOrgCoverageService { * @param pageSize * @return */ - List searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search, Boolean isPage, - Integer pageNo, Integer pageSize); + List searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize); /** * 搜索群租房列表 @@ -76,6 +74,32 @@ public interface GovOrgCoverageService { * @param pageSize * @return */ - List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, Boolean isPage, - Integer pageNo, Integer pageSize); + List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, String categoryKey, + Boolean isPage, Integer pageNo, Integer pageSize); + + /** + * 搜索公共服务 + * @param customerId + * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchPublicServiceEntities(String customerId, String staffOrgIds, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize); + + /** + * 搜索优势资源 + * @param customerId + * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 758331793c..1118254af6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -3,14 +3,8 @@ package com.epmet.dataaggre.service.govorg.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; -import com.epmet.dataaggre.dao.govorg.IcCityManagementDao; -import com.epmet.dataaggre.dao.govorg.IcCoverageCategoryDictDao; -import com.epmet.dataaggre.dao.govorg.IcDangerousChemicalsDao; -import com.epmet.dataaggre.dao.govorg.IcHouseDao; -import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; -import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity; -import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.dao.govorg.*; +import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; @@ -35,6 +29,12 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Autowired private IcDangerousChemicalsDao dangerousChemicalsDao; + @Autowired + private IcPublicServiceDao publicServiceDao; + + @Autowired + private IcSuperiorResourceDao superiorResourceDao; + @Autowired private IcHouseDao icHouseDao; @@ -43,18 +43,20 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { * @param categoryKeys * @return */ - public Map> getMappingRelationByCategoryKey(List categoryKeys) { + public Map> getMappingRelationByCategoryKey(List categoryKeys, String customerId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(IcCoverageCategoryDictEntity::getCategoryKey, categoryKeys); + query.in(IcCoverageCategoryDictEntity::getCustomerId, customerId); List dict = coverageCategoryDictDao.selectList(query); return map(dict); } @Override - public Map> getMappingRelationByCoverageType(List coverageTypes) { + public Map> getMappingRelationByCoverageType(List coverageTypes, String customerId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(IcCoverageCategoryDictEntity::getCoverageType, coverageTypes); + query.in(IcCoverageCategoryDictEntity::getCustomerId, customerId); List dict = coverageCategoryDictDao.selectList(query); return map(dict); @@ -92,9 +94,10 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { * @return */ @Override - public List searchCityResourceEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + public List searchCityResourceEntities(String customerId, String agencyIdPath, String search, String category, Boolean isPage, Integer pageNo, Integer pageSize) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCityManagementEntity::getCustomerId, customerId); + query.eq(IcCityManagementEntity::getCategory, category); query.likeRight(IcCityManagementEntity::getAgencyIdPath, agencyIdPath); if (StringUtils.isNotBlank(search)) { query.like(IcCityManagementEntity::getName, search); @@ -117,9 +120,11 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { * @return */ @Override - public List searchDangerousChemicalEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + public List searchDangerousChemicalEntities( + String customerId, String agencyIdPath, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcDangerousChemicalsEntity::getCustomerId, customerId); + query.eq(IcDangerousChemicalsEntity::getCategory, categoryKey); query.likeRight(IcDangerousChemicalsEntity::getAgencyIdPath, agencyIdPath); if (StringUtils.isNotBlank(search)) { query.like(IcDangerousChemicalsEntity::getName, search); @@ -132,7 +137,52 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, Boolean isPage, Integer pageNo, Integer pageSize) { + public List searchGroupRentHouseEntities(String customerId, String agencyIdPath, String search, String categoryKey, + Boolean isPage, Integer pageNo, Integer pageSize) { return null; } + + /** + * 搜索公共服务 + * @param customerId + * @param staffOrgIds 查询人所属的组织ID路径，包含他本身所在的组织 + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + @Override + public List searchPublicServiceEntities(String customerId, String staffOrgIds, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPublicServiceEntity::getCustomerId, customerId); + query.likeRight(IcPublicServiceEntity::getAgencyIdPath, staffOrgIds); + query.eq(IcPublicServiceEntity::getCategory, categoryKey); + if (StringUtils.isNotBlank(search)) { + query.like(IcPublicServiceEntity::getName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + return publicServiceDao.selectList(query); + } + + @Override + public List searchSuporiorResourceEntities(String customerId, String staffOrgIds, String search, + String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcSuperiorResourceEntity::getCustomerId, customerId); + query.eq(IcSuperiorResourceEntity::getCategory, categoryKey); + query.likeRight(IcSuperiorResourceEntity::getAgencyIdPath, staffOrgIds); + if (StringUtils.isNotBlank(search)) { + query.like(IcSuperiorResourceEntity::getName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo ,pageSize); + } + return superiorResourceDao.selectList(query); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java index a48ff394b8..87b09e1514 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.heart; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; +import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import java.util.List; @@ -12,12 +13,28 @@ public interface HeartService { * 搜索社区自组织列表 * @param customerId 客户ID * @param agencyId 当前查询人员所属组织ID - * @param agencyPids 当前查询人员所属组织的所有上级id path + * @param staffOrgIds 当前查询人员所属组织的所有上级id path * @param search 搜索条件 * @param isPage * @param pageNo * @param pageSize * @return */ - List searchCommunityOrgEntities(String customerId, String agencyId, String agencyPids, String search, Boolean isPage, Integer pageNo, Integer pageSize); + List searchCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, + String search, String categoryKey, Boolean isPage, + Integer pageNo, Integer pageSize); + + /** + * + * @param customerId + * @param agencyId + * @param staffOrgIds + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + List searchPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, + String search, Boolean isPage, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index 351bfca067..332720d70a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao; +import com.epmet.dataaggre.dao.heart.IcPartyUnitDao; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; +import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import com.epmet.dataaggre.service.heart.HeartService; import com.epmet.dto.result.PartyMemberUserIdsResultDTO; import com.github.pagehelper.PageHelper; @@ -21,23 +23,26 @@ public class HeartServiceImpl implements HeartService { @Autowired private IcCommunitySelfOrganizationDao communitySelfOrganizationDao; + @Autowired + private IcPartyUnitDao partyUnitDao; + /** * 搜索社区自组织列表 * @param customerId 客户ID * @param agencyId 当前查询人员所属组织ID - * @param agencyPids 当前查询人员所属组织的所有上级id path + * @param staffOrgIds 当前查询人员所属id path * @param search 搜索条件 * @return 社区自组织列表 */ @Override public List searchCommunityOrgEntities( - String customerId, String agencyId, String agencyPids, String search, + String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, Integer pageSize) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCommunitySelfOrganizationEntity::getCustomerId, customerId); - query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search); - query.or(q -> q.eq(IcCommunitySelfOrganizationEntity::getOrgId, agencyId).likeRight(IcCommunitySelfOrganizationEntity::getPids, agencyPids)); + query.eq(IcCommunitySelfOrganizationEntity::getCategoryCode, categoryKey); + query.and(q -> q.eq(IcCommunitySelfOrganizationEntity::getOrgId, agencyId).or().likeRight(IcCommunitySelfOrganizationEntity::getPids, staffOrgIds)); if (StringUtils.isNotBlank(search)) { query.like(IcCommunitySelfOrganizationEntity::getOrganizationName, search); } @@ -47,4 +52,34 @@ public class HeartServiceImpl implements HeartService { } return communitySelfOrganizationDao.selectList(query); } + + /** + * + * @param customerId + * @param agencyId 当前查询人员所属组织ID + * @param staffOrgIds 当前查询人员所属id path + * @param search + * @param isPage + * @param pageNo + * @param pageSize + * @return + */ + @Override + public List searchPartyUnitEntities( + String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search, + Boolean isPage, Integer pageNo, Integer pageSize) { + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcPartyUnitEntity::getCustomerId, customerId); + query.eq(IcPartyUnitEntity::getType, partyUnitType); + query.and(q -> q.eq(IcPartyUnitEntity::getAgencyId, agencyId).or().likeRight(IcPartyUnitEntity::getPids, staffOrgIds)); + if (StringUtils.isNotBlank(search)) { + query.like(IcPartyUnitEntity::getUnitName, search); + } + + if (isPage) { + PageHelper.startPage(pageNo, pageSize); + } + return partyUnitDao.selectList(query); + } } 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 5e9fd31621..c8e01dbeeb 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 @@ -9,10 +9,9 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; -import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; -import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; +import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.epmetuser.impl.IcResiServiceImpl; @@ -59,6 +58,7 @@ public class CoverageServiceImpl implements CoverageService { public static final String PLACE_TYPE_GROUP_RENT= "group_rent"; public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service"; public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; + public static final String PLACE_TYPE_PARTY_UNIT= "party_unit"; /** * 图层，大屏数据分析，数据列表 @@ -80,10 +80,10 @@ public class CoverageServiceImpl implements CoverageService { Map> mapping; if (CollectionUtils.isNotEmpty(categoryKeys)) { // 有分类keys，使用分类keys查询，使用coverageTypes分组 - mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys); + mapping = orgCoverageService.getMappingRelationByCategoryKey(categoryKeys, customerId); } else { // 没有分类keys，使用coverageTypes直接查询 - mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes); + mapping = orgCoverageService.getMappingRelationByCoverageType(coverageTypes, customerId); } // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询 @@ -172,20 +172,29 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { // 城市资源管理 - List cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + List cityResources = orgCoverageService.searchCityResourceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); cityResources.stream() .map(resource -> new CoverageAnalisisDataListResultDTO(resource.getId(), categoryKey, placeType, resource.getName(), resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { // 社区自组织 - List l = heartService.searchCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, isPage, pageNo, pageSize); + List l = heartService.searchCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream() .map(org -> new CoverageAnalisisDataListResultDTO(org.getId(), categoryKey, placeType, org.getOrganizationName(), org.getLatitude(), org.getLongitude())) .collect(Collectors.toList()); + } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { + // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 + if (categoryKey.equals("pu_jgzsbm")) { + String partyUnitType = "3"; + List l = heartService.searchPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); + return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getUnitName(), dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); + } + return new ArrayList<>(); } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { // 危化企业 - List l = orgCoverageService.searchDangerousChemicalEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + List l = orgCoverageService.searchDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { @@ -193,18 +202,28 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { - // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） - List icHouseEntities = orgCoverageService.searchGroupRentHouseEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); - //icHouseEntities + // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定） todo + //select h.id, b.LATITUDE, b.LONGITUDE, concat(nei.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME, u.UNIT_NAME) + //from ic_house h + //inner join ic_neighbor_hood nei on (h.NEIGHBOR_HOOD_ID = nei.ID and nei.DEL_FLAG='0') + //inner join ic_building b on (h.BUILDING_ID = b.ID and b.DEL_FLAG='0') + //inner join ic_building_unit u on (h.BUILDING_UNIT_ID = u.ID and u.DEL_FLAG='0') + //List houses = orgCoverageService.searchGroupRentHouseEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize); + //return houses.stream().map(h -> { + // new CoverageAnalisisDataListResultDTO(h.getId(), categoryKey, placeType, h.getName(), h.getLatitude(), h.getLongitude()); + //}) + // .collect(Collectors.toList()); } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { // 公共服务 - - + List l = orgCoverageService.searchPublicServiceEntities(customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + return l.stream().map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, placeType, dc.getName(), 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, placeType, dc.getName(), dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); } return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcPublicServiceDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcPublicServiceDao.xml new file mode 100644 index 0000000000..710713be55 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcPublicServiceDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcSuperiorResourceDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcSuperiorResourceDao.xml new file mode 100644 index 0000000000..a2c5c9589f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcSuperiorResourceDao.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcPartyUnitDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcPartyUnitDao.xml new file mode 100644 index 0000000000..0b1f724c9d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcPartyUnitDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file