From 10f29d7a6eff3dd9e35ab76ef84d505431dc8d9d Mon Sep 17 00:00:00 2001 From: luyan Date: Tue, 30 May 2023 14:25:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BB=9F=E8=AE=A1=E5=92=8C=E5=AE=89=E5=85=A8=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingshan/PlaceOrgByTypeResultDTO.java | 27 +++++++++ .../controller/IcPlaceOrgController.java | 24 ++++++-- .../IcPlacePatrolRecordController.java | 24 ++++++-- .../java/com/epmet/dao/IcPlaceOrgDao.java | 5 +- .../com/epmet/dao/IcPlacePatrolRecordDao.java | 6 +- .../com/epmet/service/IcPlaceOrgService.java | 7 ++- .../service/IcPlacePatrolRecordService.java | 5 ++ .../service/impl/IcPlaceOrgServiceImpl.java | 50 +++++++++++++++++ .../impl/IcPlacePatrolRecordServiceImpl.java | 49 +++++++++++++++++ .../main/resources/mapper/IcPlaceOrgDao.xml | 55 ++++++++++++------- .../mapper/IcPlacePatrolRecordDao.xml | 15 +++++ 11 files changed, 233 insertions(+), 34 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java 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 new file mode 100644 index 0000000000..542cb3b3c6 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PlaceOrgByTypeResultDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author yan Lu + * @description 灵山大屏，企业分类统计 + * @create 2023/5/30 10:21 + */ +@Data +public class PlaceOrgByTypeResultDTO implements Serializable { + + /** + * 类型名称 + */ + private String dictLabel; + /** + * 类型值 + */ + private String dictValue; + /** + * 企业数量 + */ + private Integer total; +} 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 454119a4b8..44adcd3b89 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 @@ -26,12 +26,12 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.service.IcPlaceOrgService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** @@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("placeorg") public class IcPlaceOrgController { - + @Autowired private IcPlaceOrgService placeOrgService; @@ -105,5 +105,17 @@ public class IcPlaceOrgController { return new Result().ok(placeOrgService.getList(formDTO)); } + /** + * 根据生产企业类型，分类统计企业数量 + * + * @return + */ + @GetMapping("getPlaceOrgByType") + public Result> getPlaceOrgByType(@RequestParam("orgId") String orgId, + @RequestParam("orgType") String orgType, + @RequestParam("dictType") String dictType) { + return new Result().ok(placeOrgService.getPlaceOrgByType(orgId, orgType, dictType)); + } + -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java index bd232e2ca7..6c65c16ad9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java @@ -26,12 +26,12 @@ import com.epmet.dto.form.EditPlacePatrolRecordFormDTO; import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO; import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO; import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.service.IcPlacePatrolRecordService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** @@ -106,4 +106,18 @@ public class IcPlacePatrolRecordController { } -} \ No newline at end of file + /** + * 根据隐患类型，分类统计数量 + * + * @return + */ + @GetMapping("getPlacePatrolRecordByType") + public Result> getPlacePatrolRecordByType(@RequestParam("orgId") String orgId, + @RequestParam("orgType") String orgType, + @RequestParam("dictType") String dictType) { + return new Result().ok(placePatrolRecordService.getPlacePatrolRecordByType(orgId, orgType, dictType)); + } + + + +} 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 a3c5c667bd..af0cf51905 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 @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlaceOrgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -40,4 +42,5 @@ public interface IcPlaceOrgDao extends BaseDao { **/ List getList(GetListPlaceOrgFormDTO formDTO); -} \ No newline at end of file + List getPlaceOrgByType(@Param("orgPath") String orgPath); +} 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 be3bd364f2..878d4efc36 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 @@ -20,8 +20,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO; import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlacePatrolRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -35,4 +37,6 @@ import java.util.List; public interface IcPlacePatrolRecordDao extends BaseDao { List getList(GetListPlacePatrolRecordFormDTO dto); -} \ No newline at end of file + + List getPlacePatrolRecordByType(@Param("orgPath") String orgPath); +} 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 e8fed58f7a..5f1b6e4c41 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 @@ -23,8 +23,11 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlaceOrgEntity; +import java.util.List; + /** * 九小场所下组织管理 * @@ -62,4 +65,6 @@ public interface IcPlaceOrgService extends BaseService { * @Description 九小场所下组织列表查询 **/ GetListPlaceOrgResultDTO getList(GetListPlaceOrgFormDTO formDTO); -} \ No newline at end of file + + List getPlaceOrgByType(String orgId, String orgType, String dictType); +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java index c5a63ac227..8c14e52dec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java @@ -22,8 +22,11 @@ import com.epmet.dto.form.AddPlacePatrolRecordFormDTO; import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO; import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO; import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlacePatrolRecordEntity; +import java.util.List; + /** * 场所巡查记录 * @@ -58,4 +61,6 @@ public interface IcPlacePatrolRecordService extends BaseService getPlacePatrolRecordByType(String orgId, String orgType, String dictType); } 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 0fd4ebcb75..058e0281a9 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,14 +29,19 @@ 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.SysDictDataDTO; import com.epmet.dto.form.AddPlaceOrgFormDTO; import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlaceOrgEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPlaceOrgService; @@ -49,6 +54,7 @@ import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 九小场所下组织管理 @@ -58,6 +64,7 @@ import java.util.Map; */ @Service public class IcPlaceOrgServiceImpl extends BaseServiceImpl implements IcPlaceOrgService { + @Autowired private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; @@ -176,4 +183,47 @@ 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); + for (PlaceOrgByTypeResultDTO dto : resDto) { + dto.setDictLabel(dtoMaps.get(dto.getDictValue())); + } + for (String key : dtoMaps.keySet()) { + for (PlaceOrgByTypeResultDTO dto : resDto) { + if (dto.getDictValue().equals(key)) { + dto.setDictLabel(dtoMaps.get(key)); + break; + } else { + PlaceOrgByTypeResultDTO pd = new PlaceOrgByTypeResultDTO(); + pd.setDictValue(key); + pd.setDictLabel(dtoMaps.get(key)); + pd.setTotal(0); + resDto.add(pd); + break; + } + } + } + return resDto; + } + + /** + * @deprecationg 获取orgPath + */ + private String getOrgPath(String orgId, String orgType) { + if (OrgInfoConstant.AGENCY.equals(orgType)) { // 行政组织 + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + return PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()); + } else {// 网格 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(orgId); + return PidUtils.convertPid2OrgIdPath(gridInfo.getId(), gridInfo.getPids()); + } + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java index eafac6355a..050f23c716 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java @@ -23,20 +23,27 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; 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.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.constant.OrgInfoConstant; import com.epmet.dao.IcPlacePatrolRecordDao; import com.epmet.dao.IcPlacePatrolTeamStaffDao; import com.epmet.dto.IcPlacePatrolTeamStaffDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.form.AddPlacePatrolRecordFormDTO; import com.epmet.dto.form.GetListPlacePatrolRecordFormDTO; import com.epmet.dto.result.GetListPlacePatrolRecordResultDTO; import com.epmet.dto.result.PlacePatrolRecordDetailResultDTO; +import com.epmet.dto.result.lingshan.PlaceOrgByTypeResultDTO; import com.epmet.entity.IcPlaceAttachmentEntity; import com.epmet.entity.IcPlacePatrolRecordEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -54,6 +61,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; @@ -264,4 +272,45 @@ public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl getPlacePatrolRecordByType(String orgId, String orgType, String dictType) { + //获取字典 + List dtos = epmetAdminOpenFeignClient.dictDataList(dictType).getData(); + //转换查询参数 + Map dtoMaps = dtos.stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)); + List resDto = baseDao.getPlacePatrolRecordByType(getOrgPath(orgId, orgType)); + for (PlaceOrgByTypeResultDTO dto : resDto) { + dto.setDictLabel(dtoMaps.get(dto.getDictValue())); + } + for (String key : dtoMaps.keySet()) { + for (PlaceOrgByTypeResultDTO dto : resDto) { + if (dto.getDictValue().equals(key)) { + dto.setDictLabel(dtoMaps.get(key)); + break; + } else { + PlaceOrgByTypeResultDTO pd = new PlaceOrgByTypeResultDTO(); + pd.setDictValue(key); + pd.setDictLabel(dtoMaps.get(key)); + pd.setTotal(0); + resDto.add(pd); + break; + } + } + } + return resDto; + } + + /** + * @deprecationg 获取orgPath + */ + private String getOrgPath(String orgId, String orgType) { + if (OrgInfoConstant.AGENCY.equals(orgType)) { // 行政组织 + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + return PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids()); + } else {// 网格 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(orgId); + return PidUtils.convertPid2OrgIdPath(gridInfo.getId(), gridInfo.getPids()); + } + } } 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 d655c10a89..3cc50a144a 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 @@ -5,29 +5,29 @@ + + 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 65d329baed..ec32a9465d 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 @@ -58,4 +58,19 @@ a.created_time DESC + +