From add3a20c041b7563a1d10d7f0c5c7e80e81abcbb Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 30 May 2023 16:57:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E3=80=81=E5=B7=A1=E6=9F=A5=E6=AC=A1=E6=95=B0=E3=80=81=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcPlaceOrgStatistics.java | 37 +++++++++++++ .../lingshan/PlaceOrgByTypeResultDTO.java | 1 + .../controller/IcPlaceOrgController.java | 21 ++++++-- .../java/com/epmet/dao/IcPlaceOrgDao.java | 5 +- .../com/epmet/dao/IcPlacePatrolRecordDao.java | 2 +- .../com/epmet/service/IcPlaceOrgService.java | 3 ++ .../service/impl/IcPlaceOrgServiceImpl.java | 21 ++------ .../impl/IcPlacePatrolRecordServiceImpl.java | 2 +- .../main/resources/mapper/IcPlaceOrgDao.xml | 53 ++++++++++++++++++- .../mapper/IcPlacePatrolRecordDao.xml | 9 +++- 10 files changed, 128 insertions(+), 26 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgStatistics.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgStatistics.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgStatistics.java new file mode 100644 index 0000000000..8de5d8943f --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgStatistics.java @@ -0,0 +1,37 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yan Lu + * @description 灵山大屏安全生产企业统计 + * @create 2023/5/30 15:15 + */ +@Data +public class IcPlaceOrgStatistics implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 重点企业总数量 + */ + private Integer securityCount; + + /** + * 安全巡查次数 + */ + private Integer inspectionsCount; + + /** + * 存在隐患数量 + */ + + private Integer dangerCount; + + /** + * 排除隐患数量 + */ + private Integer removeCount; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java index 542cb3b3c6..5c03555e86 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java @@ -12,6 +12,7 @@ import java.io.Serializable; @Data public class PlaceOrgByTypeResultDTO implements Serializable { + private static final long serialVersionUID = 1L; /** * 类型名称 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java index 44adcd3b89..7ac05e48ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java @@ -21,6 +21,7 @@ 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.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.IcPlaceOrgStatistics; import com.epmet.dto.form.AddPlaceOrgFormDTO; import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; @@ -105,10 +106,13 @@ public class IcPlaceOrgController { return new Result().ok(placeOrgService.getList(formDTO)); } + /** - * 根据生产企业类型，分类统计企业数量 - * - * @return + * @return null + * @throws + * @description 根据生产企业类型，分类统计企业数量 + * @author yan Lu + * @date 2023/5/30 15:21 */ @GetMapping("getPlaceOrgByType") public Result> getPlaceOrgByType(@RequestParam("orgId") String orgId, @@ -117,5 +121,16 @@ public class IcPlaceOrgController { return new Result().ok(placeOrgService.getPlaceOrgByType(orgId, orgType, dictType)); } + /** + * @description 灵山大屏，统计安全生产企业个类型统计数量 + * @author yan Lu + * @date 2023/5/30 15:21 + */ + @GetMapping("countPlaceOrgByDangerType") + public Result countPlaceOrgByDangerType(@RequestParam("orgId") String orgId, + @RequestParam("orgType") String orgType) { + return new Result().ok(placeOrgService.countPlaceOrgByDangerType(orgId, orgType)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java index af0cf51905..ffdfa2697c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPlaceOrgStatistics; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; @@ -42,5 +43,7 @@ public interface IcPlaceOrgDao extends BaseDao { **/ List getList(GetListPlaceOrgFormDTO formDTO); - List getPlaceOrgByType(@Param("orgPath") String orgPath); + List getPlaceOrgByType(@Param("orgId")String orgId,@Param("orgType")String orgType); + + IcPlaceOrgStatistics countPlaceOrgByDangerType(@Param("orgId")String orgId,@Param("orgType")String orgType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java index 878d4efc36..3832dfc410 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java @@ -38,5 +38,5 @@ public interface IcPlacePatrolRecordDao extends BaseDao getList(GetListPlacePatrolRecordFormDTO dto); - List getPlacePatrolRecordByType(@Param("orgPath") String orgPath); + List getPlacePatrolRecordByType(@Param("orgId")String orgId,@Param("orgType")String orgType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java index 5f1b6e4c41..d921a7e400 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java @@ -18,6 +18,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.dto.IcPlaceOrgStatistics; import com.epmet.dto.form.AddPlaceOrgFormDTO; import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; @@ -67,4 +68,6 @@ public interface IcPlaceOrgService extends BaseService { GetListPlaceOrgResultDTO getList(GetListPlaceOrgFormDTO formDTO); List getPlaceOrgByType(String orgId, String orgType, String dictType); + + IcPlaceOrgStatistics countPlaceOrgByDangerType(String orgId, String orgType); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java index 058e0281a9..26bf8ff723 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlaceOrgServiceImpl.java @@ -29,12 +29,10 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constant.OrgInfoConstant; import com.epmet.dao.IcPlaceOrgDao; +import com.epmet.dto.IcPlaceOrgStatistics; import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.AddPlaceOrgFormDTO; import com.epmet.dto.form.EditPlaceOrgFormDTO; @@ -186,12 +184,11 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl getPlaceOrgByType(String orgId, String orgType, String dictType) { - String orgPath = getOrgPath(orgId, orgType); //获取字典 List dtos = epmetAdminOpenFeignClient.dictDataList(dictType).getData(); //转换查询参数 Map dtoMaps = dtos.stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)); - List resDto = baseDao.getPlaceOrgByType(orgPath); + List resDto = baseDao.getPlaceOrgByType(orgId, orgType); for (PlaceOrgByTypeResultDTO dto : resDto) { dto.setDictLabel(dtoMaps.get(dto.getDictValue())); } @@ -213,17 +210,9 @@ public class IcPlaceOrgServiceImpl extends BaseServiceImpl dtos = epmetAdminOpenFeignClient.dictDataList(dictType).getData(); //转换查询参数 Map dtoMaps = dtos.stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)); - List resDto = baseDao.getPlacePatrolRecordByType(getOrgPath(orgId, orgType)); + List resDto = baseDao.getPlacePatrolRecordByType(orgId, orgType); for (PlaceOrgByTypeResultDTO dto : resDto) { dto.setDictLabel(dtoMaps.get(dto.getDictValue())); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml index 3cc50a144a..66a18823b6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml @@ -63,11 +63,60 @@ ic_place_org p p.DEL_FLAG = 0 - - AND p.PIDS LIKE concat(#{orgPath},'%') + + + AND p.agency_id = #{orgId} + + + AND p.grid_id = #{orgId} + GROUP BY p.NINE_PLACE_VAL + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml index ec32a9465d..2ac4231658 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolRecordDao.xml @@ -66,8 +66,13 @@ ic_place_patrol_record r r.DEL_FLAG = 0 - - AND r.PIDS LIKE concat(#{orgPath},'%') + + + AND r.agency_id = #{orgId} + + + AND r.grid_id = #{orgId} + GROUP BY r.DANGER_TYPE From de5a30f5a24c4d127846bd2aa78fe8bfbdeef4de Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 30 May 2023 17:27:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E7=89=B9=E6=AE=8A=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcSpecialDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 01e0591f53..f69191a1e8 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 @@ -15,7 +15,7 @@ , r.HOME_ID , s.CREATED_TIME , s.UPDATED_TIME - , s.SPECIAL_RQLB SPECIAL_TYPES_STR, + , s.SPECIAL_RQLB SPECIAL_TYPES_STR , r.GENDER , r.BIRTHDAY , year(now()) - year(r.BIRTHDAY) as age