From 390d0a6408196b56cc49c021a5d87a9adb373178 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 17:24:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8F=88=E6=9A=82=E6=8F=90=E4=BA=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcCityManagementDao.java | 5 ++ .../service/impl/CoverageServiceImpl.java | 70 ++++++++++++------- .../mapper/govorg/IcCityManagementDao.xml | 70 +++++++++++++++++-- .../mapper/govproject/IcEventDao.xml | 4 +- 4 files changed, 118 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java index 5fcc8ac3c2..04746db059 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java @@ -24,6 +24,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取公共服务信息 @@ -32,6 +33,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取重点危化品企业信息 @@ -40,6 +42,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取优势资源信息 @@ -48,6 +51,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取企事业单位巡查信息 @@ -56,5 +60,6 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file 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 0d2b4a922a..5a050263b6 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 @@ -244,17 +244,23 @@ public class CoverageServiceImpl implements CoverageService { PageInfo allIcUserPageInfo = getIcUserPageInfo(formDTO); result.setUserInfos(allIcUserPageInfo.getList()); result.setUserInfosTotal(allIcUserPageInfo.getTotal()); - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){ + }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ + for (String resource : resources) { - if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; + if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){ + } } - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ - } }else { // 查询居民 @@ -263,59 +269,73 @@ public class CoverageServiceImpl implements CoverageService { result.setUserInfosTotal(allIcUserPageInfo.getTotal()); List reInfos = new ArrayList<>(); for (String table : tables) { + if (formDTO.getIsPage() && reInfos.size() == formDTO.getPageSize()){ + break; + } + Integer flag = formDTO.getPageSize() - reInfos.size(); switch (table){ case TableConstant.IC_SUPERIOR_RESOURCE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); - if (!superiorResourceInfos.isEmpty()){ + if (formDTO.getIsPage() && superiorResourceInfos.size() > flag){ + reInfos.addAll(superiorResourceInfos.subList(NumConstant.ZERO, flag)); + }else { reInfos.addAll(superiorResourceInfos); } break; case TableConstant.IC_CITY_MANAGEMENT: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); List cityManageInfos = govOrgService.getCityManageInfos(formDTO); - if (!cityManageInfos.isEmpty()){ + if (formDTO.getIsPage() && cityManageInfos.size() > flag){ + reInfos.addAll(cityManageInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(cityManageInfos); } break; case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO)); List communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO); - if (!communitySelOrgInfos.isEmpty()){ + if (formDTO.getIsPage() && communitySelOrgInfos.size() > flag){ + reInfos.addAll(communitySelOrgInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(communitySelOrgInfos); } break; case TableConstant.IC_DANGEROUS_CHEMICALS: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); - if (!dangerousChemicalsInfos.isEmpty()){ + if (formDTO.getIsPage() && dangerousChemicalsInfos.size() > flag){ + reInfos.addAll(dangerousChemicalsInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(dangerousChemicalsInfos); } break; case TableConstant.IC_ENTERPRISE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); - if (!enterpriseInfos.isEmpty()){ + if (formDTO.getIsPage() && enterpriseInfos.size() > flag){ + reInfos.addAll(enterpriseInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(enterpriseInfos); } break; case TableConstant.IC_PUBLIC_SERVICE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); - if (!publicServiceInfos.isEmpty()){ + if (formDTO.getIsPage() && publicServiceInfos.size() > flag){ + reInfos.addAll(publicServiceInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(publicServiceInfos); } break; - case TableConstant.IC_EVENT: - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; default: break; } } result.setResourceInfos(reInfos); + result.setResourceInfoTotal(Long.valueOf(String.valueOf(reInfos.size()))); + } + for (String resource : resources) { + if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ + PageInfo eventPageInfo = getEventInfo(formDTO); + result.setEventInfos(eventPageInfo.getList()); + result.setEventInfoTotal(eventPageInfo.getTotal()); + break; + } } return result; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml index 21c839a27e..29476955de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -20,7 +20,9 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') - AND `NAME` LIKE CONCAT('%',#{name},'%') + + AND `NAME` LIKE CONCAT('%',#{name},'%') + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index f35dd89392..547ff69899 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -16,6 +16,8 @@ AND customer_id = #{customerId} AND DIFFICULT_POINT = '1' AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') - AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + + AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + \ No newline at end of file From 257ec3c2be7f3d350833044c224fb3b172b037a0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 17:35:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DepartmentServiceImpl.java | 9 +++++---- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 51ab136d05..8f71eb4716 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -328,6 +328,7 @@ public class DepartmentServiceImpl implements DepartmentService { } //查不到工作人员就直接返回 if (null == userResult.getData()) { + resultDTO.setType(true); return resultDTO; } @@ -497,13 +498,14 @@ public class DepartmentServiceImpl implements DepartmentService { if (!projectResult.success()) { throw new RenException("获取工作人员代办项目数据失败" + projectResult.getMsg()); } - if(projectResult.getData().size()>NumConstant.ZERO){ - String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作",("party_unit".equals(formDTO.getDeptType())?"联建单位":"社会自组织")); + if (projectResult.getData().size() > NumConstant.ZERO) { + String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作", ("party_unit".equals(formDTO.getDeptType()) ? "联建单位" : "社会自组织")); resultDTO.setMsg(msg); + return resultDTO; } //2.无代办项目的则删除部门、工作人员信息、修改联建单位/社会自组织业务数据 //2-1.删除部门 - customerDepartmentDao.deleteById(formDTO.getId()); + customerDepartmentDao.deleteById(formDTO.getDeptId()); //2-2.删除部门人员关系数据 LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CustomerStaffDepartmentEntity::getDepartmentId, formDTO.getDeptId()); @@ -511,7 +513,6 @@ public class DepartmentServiceImpl implements DepartmentService { customerStaffDepartmentDao.delete(query); //2-3.删除人员注册关系数据 LambdaQueryWrapper StaffOrgRelation = new LambdaQueryWrapper<>(); - StaffOrgRelation.eq(StaffOrgRelationEntity::getOrgId, formDTO.getDeptId()); StaffOrgRelation.eq(StaffOrgRelationEntity::getStaffId, formDTO.getDeptStaffId()); staffOrgRelationDao.delete(StaffOrgRelation); //2-4.删除工作人员数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index b25d014fc5..8fcc9b5338 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -886,9 +886,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl resultRole = govAccessFeignClient.getGovRole(roleDTO); - if (!resultRole.success()) { + if (!resultRole.success() || null == resultRole.getData()) { throw new RenException("人员添加失败" + resultRole.getMsg()); } List newRoles = new ArrayList<>(); From 5177ad45412148cf37161eba3796f560bdb5aee7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 17:37:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index dc505b1985..6b7db20347 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -317,6 +317,7 @@ lb://gov-access-server + From 3678169c94f7a5d797354faff05ea7348c8ef7a4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 28 Jul 2022 22:18:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=201.=E5=B0=86=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E5=8F=B3=E8=8F=9C=E5=8D=95=E8=B7=9Fmenu?= =?UTF-8?q?=E7=BB=91=E5=AE=9A;2.=E5=B9=B6=E4=B8=94=E5=B0=86=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E4=BA=BA=E7=BE=A4=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E4=BB=8Ecategory=5Fdict=E4=B8=AD=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E8=B7=9Foper=5Fcustomize.ic=5Fresi?= =?UTF-8?q?=5Fcategory=5Fwarn=5Fconfig=E4=B8=AD=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 90 +++++++++++-------- 1 file changed, 52 insertions(+), 38 deletions(-) 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 0d2b4a922a..38ad15d704 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 @@ -655,6 +655,14 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listAnalysisResourceCategories() { + // 获取所有菜单的url + List menuUrls = new ArrayList<>(128); + + List menus = govCustomerMenuRedis.getCustomerMenuList(EpmetRequestHolder.getLoginUserCustomerId(), 0, "gov_menu"); + if (CollectionUtils.isNotEmpty(menus)) { + menus.stream().forEach(m -> menuUrls.add(m.getUrl())); + } + //结果集 ArrayList results = new ArrayList<>(); @@ -674,29 +682,31 @@ public class CoverageServiceImpl implements CoverageService { continue; } - // 2.根据menuUrl过滤 todo - - // 2.计算各类数量 todo - // 3.对上一步得到的数据进行分组，使用PLACE_TYPE_IN_ANALYSIS分组，然后放入placeType，这一列为空的说明不分组，直接属于coverage - categoryDictEntities.forEach(c -> { - if (StringUtils.isBlank(c.getPlaceTypeInAnalysis())) { + categoryDictEntities.forEach(category -> { + if (StringUtils.isBlank(category.getPlaceTypeInAnalysis())) { // 没有placetype的 - categoriesOfThisCoverage.getCategories() - .add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(), - c.getCoverageType(), c.getPlaceType(), c.getQuantity())); + if ("all".equals(category.getMenuUrl()) || menuUrls.contains(category.getMenuUrl())) { + categoriesOfThisCoverage.getCategories() + .add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), category.getCategoryName(), + category.getCoverageType(), category.getPlaceType(), category.getQuantity())); + } } else { // 有placetype的 - AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis()); - if (placeType == null) { - placeType = new AnalysisResourceCategoriesResult.PlaceType( - c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), c.getQuantity(), new ArrayList<>()); - placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType); + AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(category.getPlaceTypeInAnalysis()); + if ("all".equals(category.getMenuUrl()) || menuUrls.contains(category.getMenuUrl())) { + + if (placeType == null) { + placeType = new AnalysisResourceCategoriesResult.PlaceType( + category.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(category.getPlaceTypeInAnalysis()).getName(), category.getQuantity(), new ArrayList<>()); + placeTypeMap.put(category.getPlaceTypeInAnalysis(), placeType); + } + + placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), + category.getCategoryName(), category.getCoverageType(), category.getPlaceType(), category.getQuantity())); + placeType.setQuantity(placeType.getQuantity() + category.getQuantity()); // todo 0改为category的count } - placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), - c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), c.getQuantity())); - placeType.setQuantity(placeType.getQuantity() + c.getQuantity()); // todo 0改为category的count } }); @@ -718,6 +728,7 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listGovernedTargetCategories() { + // 获取所有菜单的url List menuUrls = new ArrayList<>(128); List menus = govCustomerMenuRedis.getCustomerMenuList(EpmetRequestHolder.getLoginUserCustomerId(), 0, "gov_menu"); @@ -732,11 +743,22 @@ public class CoverageServiceImpl implements CoverageService { return new ArrayList<>(); } + //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 + List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); + List resiCategories2Show = categoriesNeed2Warn.stream().map(wc -> wc.getColumnName()).collect(Collectors.toList()); + List results = new ArrayList<>(); - HashMap> placeTypeMap = new HashMap<>(); + HashMap> placeTypeTargetMap = new HashMap<>(); + HashMap placeTypeQuantityMap = new HashMap<>(); targetCategories.forEach(rc -> { String placeTypeInAnalysis = rc.getPlaceTypeInAnalysis(); + if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeTypeInAnalysis) && !resiCategories2Show.contains(rc.getCategoryKey())) { + // 因为公共服务-人群，是需要跟oper_customize.ic_resi_category_warn_config表对应，只显示warn=1的， + // 所以如果是被管理对象中的公共服务人群，如果不开启预警，就跳过；其他情况都放进去 + return; + } + if (StringUtils.isEmpty(placeTypeInAnalysis)) { // 只有一层，没有子级 if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { @@ -745,41 +767,33 @@ public class CoverageServiceImpl implements CoverageService { } } else { // 有子级，需要使用placeTypeInAnalysis分组 - List targets = placeTypeMap.get(placeTypeInAnalysis); - if (CollectionUtils.isEmpty(targets)) { - targets = new ArrayList<>(); - placeTypeMap.put(placeTypeInAnalysis, targets); - } if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { + List targets = placeTypeTargetMap.get(placeTypeInAnalysis); + if (CollectionUtils.isEmpty(targets)) { + targets = new ArrayList<>(); + placeTypeTargetMap.put(placeTypeInAnalysis, targets); + placeTypeQuantityMap.put(placeTypeInAnalysis, 0); + } targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + + placeTypeQuantityMap.put(placeTypeInAnalysis, placeTypeQuantityMap.get(placeTypeInAnalysis) + rc.getQuantity()); } } }); - if (placeTypeMap.size() > 0) { - placeTypeMap.forEach((placeTypeInAnalysis, targetObjects) -> { + // 最后，把需要分组的"公共服务人群","综合治理人群"放到最后的结果列表中 + if (placeTypeTargetMap.size() > 0) { + placeTypeTargetMap.forEach((placeTypeInAnalysis, targetObjects) -> { AnalysisGovernedTargetsResult tr = new AnalysisGovernedTargetsResult(); tr.setPlaceType(placeTypeInAnalysis); + tr.setQuantity(placeTypeQuantityMap.get(placeTypeInAnalysis)); tr.setPlaceTypeName(CoveragePlaceTypeEnum.getEnum(placeTypeInAnalysis).getName()); tr.setChildren(targetObjects); results.add(tr); }); } - //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 - List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); - List ggfwrqCategories = categoriesNeed2Warn.stream().map(wc -> - new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(), - CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getName(), - 0, new ArrayList<>())).collect(Collectors.toList()); - - AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); - ggfwRq.setPlaceType(CoveragePlaceTypeEnum.RESI.getCode()); - ggfwRq.setPlaceTypeName(CoveragePlaceTypeEnum.RESI.getName()); - ggfwRq.setChildren(ggfwrqCategories); - - results.add(ggfwRq); return results; } From 2c9d66709c9b73ff95e2e5fcdaf4ab7c900d8205 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 08:43:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=88=E6=9A=82=E6=8F=90=E4=BA=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heart/IcCommunitySelfOrganizationDao.java | 1 + .../service/govorg/GovOrgService.java | 5 + .../govorg/impl/GovOrgServiceImpl.java | 25 ++++ .../dataaggre/service/heart/HeartService.java | 1 + .../service/heart/impl/HeartServiceImpl.java | 5 + .../service/impl/CoverageServiceImpl.java | 112 +++++++++++++++++- .../heart/IcCommunitySelfOrganizationDao.xml | 14 ++- 7 files changed, 159 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java index 2aab1d0be0..b0adcb3773 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java @@ -35,5 +35,6 @@ import java.util.List; public interface IcCommunitySelfOrganizationDao extends BaseDao { List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index adc04ab316..8f0faeb52e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -228,6 +228,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取公共服务信息 @@ -236,6 +237,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取重点危化品企业信息 @@ -244,6 +246,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取优势资源信息 @@ -252,6 +255,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取企事业单位巡查信息 @@ -260,5 +264,6 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 4eaab080a5..1cf12a56dd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1135,23 +1135,48 @@ public class GovOrgServiceImpl implements GovOrgService { return cityManagementDao.getCityManageInfos(formDTO); } + @Override + public Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getCityManageInfosCount(formDTO); + } + @Override public List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getPublicServiceInfos(formDTO); } + @Override + public Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getPublicServiceInfosCount(formDTO); + } + @Override public List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getDangerousChemicalsInfos(formDTO); } + @Override + public Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getDangerousChemicalsInfosCount(formDTO); + } + @Override public List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getSuperiorResourceInfos(formDTO); } + @Override + public Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getSuperiorResourceInfosCount(formDTO); + } + @Override public List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getEnterpriseInfos(formDTO); } + + @Override + public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getEnterpriseInfosCount(formDTO); + } } 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 d97044b718..03d6de4431 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 @@ -44,4 +44,5 @@ public interface HeartService { Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO); } 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 314c5d7672..7af8676a08 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 @@ -63,6 +63,11 @@ public class HeartServiceImpl implements HeartService { return communitySelfOrganizationDao.getCommunitySelOrgInfos(formDTO); } + @Override + public Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO) { + return communitySelfOrganizationDao.getCommunitySelOrgInfosCount(formDTO); + } + private LambdaQueryWrapper constructCommunityOrgQueryWrapper( String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); 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 1b94a0f270..ee4a6682fe 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 @@ -245,14 +245,24 @@ public class CoverageServiceImpl implements CoverageService { result.setUserInfos(allIcUserPageInfo.getList()); result.setUserInfosTotal(allIcUserPageInfo.getTotal()); }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ - + Integer total = NumConstant.ZERO; + Integer start = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + Integer end = start + formDTO.getPageSize(); + Integer flag; for (String resource : resources) { if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ - + Integer superiorResourceInfosCount = govOrgService.getSuperiorResourceInfosCount(formDTO); + total = total + superiorResourceInfosCount; + if (superiorResourceInfosCount > start){ + + } }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ + Integer cityManageInfosCount = govOrgService.getCityManageInfosCount(formDTO); + total = total + cityManageInfosCount; }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ - + Integer communitySelOrgInfosCount = heartService.getCommunitySelOrgInfosCount(formDTO); + total = total + communitySelOrgInfosCount; }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ @@ -340,6 +350,102 @@ public class CoverageServiceImpl implements CoverageService { return result; } + /** + * Desc: 【资源】优势资源查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getSuperiorResourcePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); + }else { + List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(superiorResourceInfos.size()))); + result.setList(superiorResourceInfos); + } + return result; + } + + /** + * Desc: 【资源】城市管理查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getCityManagePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); + }else { + List cityManageInfos = govOrgService.getCityManageInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(cityManageInfos.size()))); + result.setList(cityManageInfos); + } + return result; + } + + /** + * Desc: 【资源】公共服务查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getPublicServicePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); + }else { + List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(publicServiceInfos.size()))); + result.setList(publicServiceInfos); + } + return result; + } + + /** + * Desc: 【资源】重点危化品企业查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getDangerousChemicalsPageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); + }else { + List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(dangerousChemicalsInfos.size()))); + result.setList(dangerousChemicalsInfos); + } + return result; + } + + /** + * Desc: 【资源】企事业单位查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getEnterpriseInfosPageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); + }else { + List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(enterpriseInfos.size()))); + result.setList(enterpriseInfos); + } + return result; + } + + /** + * Desc: 居民信息查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:34 + */ public PageInfo getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){ PageInfo result = new PageInfo<>(); if (formDTO.getIsPage()){ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml index 4e660c06dd..b374071590 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -18,6 +18,18 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND CONCAT(PIDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%') - AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%') + + AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%') + + + \ No newline at end of file