From 24401318b66758bbba06a5b5af2cf0e0e56dc21e Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 18 May 2023 14:39:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EventAnalysisResultDTO.java | 17 +++++-- .../epmet/dto/result/EventRateResultDTO.java | 44 +++++++++++++++---- .../epmet/controller/IcEventController.java | 2 +- .../service/impl/IcEventServiceImpl.java | 44 ++++++++++++++----- 4 files changed, 83 insertions(+), 24 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index 80f8b2f938..906e984e35 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.Map; /** * @author yan Lu @@ -25,11 +24,21 @@ public class EventAnalysisResultDTO implements Serializable { /** * 网格化平台数量 */ - private Integer wangGeHua; + + /** + * 红灯占比 + */ + private Double daiChuLiRate; + + /** + * 黄灯占比 + */ + private Double chuLiZhongRate; + /** - * 分类统计数量 + * 蓝灯占比 */ - private Map categoryCount; + private Double yiJieAnRate; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java index a931447009..bea7f93e10 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @author yan Lu @@ -24,26 +25,53 @@ public class EventRateResultDTO implements Serializable { * 红灯数量 */ private Integer hongDeng; - /** - * 红灯占比 - */ - private Double hongDengRate; + /** * 黄灯数量 */ private Integer huangDeng; - /** - * 黄灯占比 - */ - private Double huangDengRate; + /** * 蓝灯数量 */ private Integer lanDeng; + + /** + * 红灯占比 + */ + private Double hongDengRate; + + /** + * 黄灯占比 + */ + private Double huangDengRate; + /** * 蓝灯占比 */ private Double lanDengRate; + /** + * 分类统计数量 + */ + private List category; + + @Data + public static class Category { + /** + * 分类编码 + */ + private String code; + + /** + * 分类名称 + */ + private String name; + + /** + * 分类数量 + */ + private Integer value; + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 60e5b7b12c..dd31462f70 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -560,7 +560,7 @@ public class IcEventController { } /** - * @description 获取事件数量和占比率 + * @description 获取事件数量和分类数量 * @param * @param null * @return Result * @throws diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 73648097d0..0b2fbb6e0f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1925,21 +1925,43 @@ public class IcEventServiceImpl extends BaseServiceImpl> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 + Map temp = new HashMap<>(); + if (null != dataMap && dataMap.size() > 0) { + for (Map map : dataMap) { + temp.put(String.valueOf(map.get("code")), Integer.valueOf(String.valueOf(map.get("total")))); + } + } + Result> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId()); + if (null != categoryMap && categoryMap.getData().size() > 0) { + Map map = categoryMap.getData(); + List categoryList = new ArrayList<>(); + map.keySet().forEach(key -> { + EventRateResultDTO.Category category = new EventRateResultDTO.Category(); + if (null != temp.get(key)) { + category.setCode(key); + category.setName(map.get(key)); + category.setValue(Integer.valueOf(temp.get(key))); + } else { + category.setCode(key); + category.setName(map.get(key)); + category.setValue(0); + } + categoryList.add(category); + }); + erDto.setCategory(categoryList); + } + return erDto; } @Override public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType) { - EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId,orgType)); - Result> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId()); - if (null != categoryMap && categoryMap.getData().size() > 0) { - List> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType)); - if (null != dataMap && dataMap.size() > 0) { - Map merged = new HashMap<>(); - dataMap.forEach(merged::putAll); - dto.setCategoryCount(merged); - } - } + EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType));//事件总量和灯数量,占比 + EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId, orgType)); + dto.setDaiChuLiRate(erDto.getHongDengRate() == null ? 0 : erDto.getHongDengRate()); + dto.setChuLiZhongRate(erDto.getHuangDengRate() == null ? 0 : erDto.getHuangDengRate()); + dto.setYiJieAnRate(erDto.getLanDengRate() == null ? 0 : erDto.getLanDengRate()); return dto; } From 9856b451b2b3aae7d8eab7a2a6974f24b1c21b8a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 14:53:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?LingShanHelpCrowdTypeEnum=E9=87=8D=E7=82=B9?= =?UTF-8?q?=E5=B8=AE=E6=89=B6=E4=BA=BA=E5=91=98=E7=B1=BB=E5=88=AB=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/LingShanHelpCrowdTypeEnum.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java new file mode 100644 index 0000000000..2afb9ba901 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/enums/LingShanHelpCrowdTypeEnum.java @@ -0,0 +1,49 @@ +package com.epmet.enums; + +public enum LingShanHelpCrowdTypeEnum { + // 人员类别。【canji残疾人，dabing大病，dibao低保，gaoling高龄老人，kongchao空巢老人，duju独居老人，liushou留守儿童， tekun特困人员】 + + CANJI("canji", "残疾", 1), + DABING("dabing", "大病", 2), + DIBAO("dibao", "低保", 3), + GAOLING("gaoling", "高龄老人", 4), + KONGCHAO("kongchao", "空巢老人", 5), + DUJU("duju", "独居老人", 6), + LIUSHOU("liushou", "留守儿童", 7), + TEKUN("tekun", "特困人员", 8); + + /** + * 类型。anzhibangjiao, + */ + public final String type; + public final String name; + + private Integer headerRowNumber; + + LingShanHelpCrowdTypeEnum(String type, String name, Integer headerRowNumber) { + this.type = type; + this.name = name; + this.headerRowNumber = headerRowNumber; + } + + public String getType() { + return type; + } + + public String getName() { + return name; + } + + public Integer getHeaderRowNumber() { + return headerRowNumber; + } + + public static LingShanHelpCrowdTypeEnum getByType(String type) { + for (LingShanHelpCrowdTypeEnum e : LingShanHelpCrowdTypeEnum.values()) { + if (e.getType().equals(type)) { + return e; + } + } + return null; + } +} From e47b9fee7da541d64c73351ccf55de2eed3f0f13 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 15:06:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?epmetuser/icresiuser/resi-brief/=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=82=E9=85=8D=E7=81=B5=E5=B1=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/IcResiUserBriefDTO.java | 31 ++++++++++++++ .../main/java/com/epmet/dao/IcSpecialDao.java | 9 ++++- .../service/impl/IcResiUserServiceImpl.java | 40 +++++++++++++++++++ .../main/resources/mapper/IcSpecialDao.xml | 10 +++++ 4 files changed, 89 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 87393c2a17..540b0207d9 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -90,4 +90,35 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 工作单位 */ private String gzdw; + + + /** + * 因灵山项目添加此列： + * 民族： + */ + private String mz; + + /** + * 因灵山项目添加此列： + * 与户主关系：存储字典纸 + */ + private String yhzgx; + + /** + * 因灵山项目添加此列： + * 与户主关系：名称 + */ + private String yhzgxName; + + /** + * 因灵山项目添加此列： + * 重点人群:信访人员、社区矫正、精障患者、戒毒人员、安置帮教 + */ + private List specialCrowdName; + + /** + * 因灵山项目添加此列： + * 重点人群:特困人员、留守儿童、空巢老人、高龄老人、独居老人、低保、大病、残疾人 + */ + private List helpCrowdName; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java index 81ac6f0eba..208b075208 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcSpecialDao.java @@ -11,7 +11,7 @@ import java.util.List; @Mapper public interface IcSpecialDao extends BaseDao { - public IcSpecialEntity selectByResiId(@Param("resiId") String resiId); + IcSpecialEntity selectByResiId(@Param("resiId") String resiId); List listSpecialCrowd(@Param("orgIdPath") String orgIdPath, @Param("orgId") String orgId, @@ -20,4 +20,11 @@ public interface IcSpecialDao extends BaseDao { @Param("name") String name, @Param("mobile") String mobile, @Param("idCard") String idCard); + + /** + * 查询：lingshan_help_crowd_resi_merge + * @param resiUserId + * @return 返回重点帮扶人员类别 + */ + List selectHelpCrowdType(String resiUserId); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index b149345970..a308fd7f55 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -35,6 +35,7 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.*; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -64,6 +65,8 @@ import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; +import com.epmet.enums.LingShanHelpCrowdTypeEnum; +import com.epmet.enums.LingShanSpecialCrowdTypeEnums; import com.epmet.enums.RenHuConditionEnum; import com.epmet.excel.EpidemicPreventionExportExcel; import com.epmet.excel.support.ExportResiUserItemDTO; @@ -82,6 +85,7 @@ import com.google.common.cache.CacheBuilder; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; @@ -181,6 +185,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption(); + if(yhzgxRes.success()&&CollectionUtils.isNotEmpty(yhzgxRes.getData())){ + Map yhzgxMap = yhzgxRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel)); + if(MapUtils.isNotEmpty(yhzgxMap)&&yhzgxMap.containsKey(r.getYhzgx())){ + r.setYhzgxName(yhzgxMap.get(r.getYhzgx())); + } + } + // 重点人群:信访人员、社区矫正、精障患者、戒毒人员、安置帮教 + List specialCrowdName = new ArrayList<>(); + IcSpecialEntity icSpecialEntity = icSpecialDao.selectByResiId(resiUserId); + if (null != icSpecialEntity) { + for (LingShanSpecialCrowdTypeEnums e : LingShanSpecialCrowdTypeEnums.values()) { + if (icSpecialEntity.getSpecialRqlb().contains(e.getType())) { + specialCrowdName.add(e.getName()); + } + } + } + r.setSpecialCrowdName(specialCrowdName); + //重点帮扶人员类别 + List helpCrowdName = new ArrayList<>(); + List crowdTypeList = icSpecialDao.selectHelpCrowdType(resiUserId); + if (CollectionUtils.isNotEmpty(crowdTypeList)) { + for (LingShanHelpCrowdTypeEnum e : LingShanHelpCrowdTypeEnum.values()) { + if (crowdTypeList.contains(e.getType())) { + helpCrowdName.add(e.getName()); + } + } + } + r.setHelpCrowdName(helpCrowdName); + // end lingshan // 填充网格、小区名称 String errorMsg = "【居民信息简介】查询网格、小区信息失败"; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml index 5d66f2482f..9535299885 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml @@ -43,4 +43,14 @@ order by s.UPDATED_TIME desc + \ No newline at end of file From 6c46f1c14d929921b5e2de57d46f3c769840f7ed Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 18 May 2023 15:20:12 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E4=B8=AD=E5=A4=AE=E5=8C=BA=E5=9F=9F:=E6=A5=BC=E6=A0=8B?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E5=88=86=E5=B8=83/=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B1=95=E7=A4=BA=E6=88=BF=E5=B1=8B=E5=88=86?= =?UTF-8?q?=E5=B8=83=E7=82=B9=E4=BD=8D/=E8=8E=B7=E5=8F=96=E6=A5=BC?= =?UTF-8?q?=E6=A0=8B=E8=AF=A6=E6=83=85=EF=BC=8C=E6=9C=AA=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...enPartyCenterHouseDistributionFormDTO.java | 23 +++++++ .../result/lingshan/HouseDetailResultDTO.java | 18 +++++ ...eenPartyCenterHouseDistributionResDTO.java | 43 ++++++++++++ .../LingShanScreenGovOrgController.java | 66 +++++++++++++++++++ .../java/com/epmet/dao/IcBuildingDao.java | 11 ++++ .../main/java/com/epmet/dao/IcHouseDao.java | 13 ++++ .../com/epmet/service/IcBuildingService.java | 10 +++ .../com/epmet/service/IcHouseService.java | 23 +++++-- .../service/impl/IcBuildingServiceImpl.java | 13 ++++ .../service/impl/IcHouseServiceImpl.java | 36 ++++++++-- .../main/resources/mapper/IcBuildingDao.xml | 18 +++++ .../src/main/resources/mapper/IcHouseDao.xml | 22 +++++++ 12 files changed, 288 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java new file mode 100644 index 0000000000..0417a5540e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/ScreenPartyCenterHouseDistributionFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form.lingshan; + +import com.epmet.commons.tools.validator.group.QueryGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description 灵山大屏，根据网格id，查询党员中心户房屋坐标 + * @Author yzm + * @Date 2023/5/18 10:14 + */ +@Data +public class ScreenPartyCenterHouseDistributionFormDTO { + /** + * 网格必填 + */ + @NotBlank(message = "gridId不能为空",groups = QueryGroup.class) + private String gridId; + private String neighborHoodId; + private String buildingId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java new file mode 100644 index 0000000000..cb48b95e46 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/HouseDetailResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result.lingshan; + +import com.epmet.dto.IcHouseDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 14:05 + */ +@Data +public class HouseDetailResultDTO extends IcHouseDTO { + /** + * 如果是党员中心户，关联的联户数 + */ + private Integer totalLianHu; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java new file mode 100644 index 0000000000..7e179fe4a0 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/18 10:56 + */ +@Data +public class ScreenPartyCenterHouseDistributionResDTO { + /** + * 小区id + */ + private String neighborHoodId; + private String neighborHoodName; + /** + * 所属楼栋id + */ + private String buildingId; + private String buildingName; + /** + * 所属单元id + */ + private String buildingUnitId; + private String unitName; + + /** + * 房屋名字后台插入时生成 + */ + private String houseName; + /** + * 房屋坐标 + */ + private String longitude; + private String latitude; + + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java new file mode 100644 index 0000000000..fe3123a482 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java @@ -0,0 +1,66 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcBuildingDTO; +import com.epmet.dto.IcHouseDTO; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.service.IcBuildingService; +import com.epmet.service.IcHouseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... + * @Author yzm + * @Date 2023/5/18 10:05 + */ +@RestController +@RequestMapping("houseScreen") +public class LingShanScreenGovOrgController { + @Autowired + private IcHouseService icHouseService; + @Autowired + private IcBuildingService icBuildingService; + + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } + + + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(icHouseService.queryHouseDetail(houseId)); + } + + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 2275021a67..ca6b57a3c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -276,5 +276,16 @@ public interface IcBuildingDao extends BaseDao { * @return */ List selectHouseTree(@Param("unitId") String unitId); + + /** + * 查询楼栋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f4212b5487..c2eedacf63 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -231,4 +231,17 @@ public interface IcHouseDao extends BaseDao { @Param("buildingName") String buildingName, @Param("buildingId") String buildingId, @Param("partyCenterHouseFlag") String partyCenterHouseFlag); + + /** + * 查询房屋列表：后续可以追加条件 + * @param customerId 必填！ + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List selectListByMap(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index cde64d4da0..9d60ebcb56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -133,4 +133,14 @@ public interface IcBuildingService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result getBuildingDetail(String buildingId); + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index cec8ca1349..47a8e7904a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -14,10 +14,7 @@ import com.epmet.dto.result.HouseAgencyInfoResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.IcHouseEntity; import java.util.List; @@ -183,4 +180,22 @@ public interface IcHouseService extends BaseService { * @param partyCenterHouseFlag */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..db18a933f8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -173,4 +173,17 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 8a782c376a..f76d723af1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -26,10 +26,7 @@ import com.epmet.dto.form.CheckHouseInfoFormDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; import com.epmet.dto.result.*; -import com.epmet.dto.result.lingshan.HouseTreeDTO; -import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseBindLianHuDetailDTO; -import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; +import com.epmet.dto.result.lingshan.*; import com.epmet.entity.*; import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseRentFlagEnums; @@ -563,5 +560,36 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } + } 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 2224b68099..2d632d7b2d 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 @@ -602,4 +602,22 @@ and ih.BUILDING_UNIT_ID=#{unitId} order by ih.DOOR_NAME asc + + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 7ffaff80a2..aa4b825507 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -770,4 +770,26 @@ order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc + + + From 20b7a726e2d4bce9e14c640905257686c40d3536 Mon Sep 17 00:00:00 2001 From: luyan Date: Thu, 18 May 2023 15:44:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E5=BD=92=E6=A1=A3=E7=8E=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/EventAnalysisResultDTO.java | 9 +++++++++ .../com/epmet/dto/result/EventRateResultDTO.java | 15 ++++++++++++--- .../epmet/service/impl/IcEventServiceImpl.java | 1 + .../src/main/resources/mapper/IcEventDao.xml | 12 ++++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index 906e984e35..e34285d2fd 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -26,6 +26,10 @@ public class EventAnalysisResultDTO implements Serializable { */ private Integer wangGeHua; + /** + * 归档数量 + */ + private Integer guiDang; /** * 红灯占比 */ @@ -41,4 +45,9 @@ public class EventAnalysisResultDTO implements Serializable { */ private Double yiJieAnRate; + /** + * 归档占比 + */ + + private Double guiDangRate; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java index bea7f93e10..efd13ccbf6 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java @@ -37,20 +37,29 @@ public class EventRateResultDTO implements Serializable { private Integer lanDeng; /** - * 红灯占比 + * 归档数量 + */ + private Integer guiDang; + + /** + * 未响应占比 */ private Double hongDengRate; /** - * 黄灯占比 + * 处理中占比 */ private Double huangDengRate; /** - * 蓝灯占比 + * 已完成占比 */ private Double lanDengRate; + /** + * 归档占比 + */ + private Double guiDangRate; /** * 分类统计数量 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 0b2fbb6e0f..8364ff7231 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1962,6 +1962,7 @@ public class IcEventServiceImpl extends BaseServiceImpl and d.GRID_PIDS like concat(#{orgIdPath},'%') - ) ed + ) ed, + ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END ) as dang + FROM ic_event d WHERE d.DEL_FLAG = 0 + + and d.GRID_PIDS like concat(#{orgIdPath},'%') + + ) ee