From 965f109f363aaa0389c1168f01eccecef43c467c Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 11 May 2023 18:07:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B0=83=E9=94=99=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index a1cfc38328..ce476682a5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -12,6 +12,7 @@ import com.epmet.commons.tools.enums.CollectUrlEnum; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; @@ -134,6 +135,7 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl Date: Fri, 12 May 2023 09:08:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=86=99=E7=82=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/epmet-cloud.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/doc/epmet-cloud.md b/doc/epmet-cloud.md index e47ddfc70e..e2a5d270cf 100644 --- a/doc/epmet-cloud.md +++ b/doc/epmet-cloud.md @@ -14,7 +14,23 @@ PS:目前正在测试通过负载均衡器和本地环境变量实现动态修 ## 私有化部署 -##### 需要开放哪些域名 +##### 需要对外访问哪些域名 -- epmet-cloud.elinkservice.cn 微信交互代理 -- dysmsapi.aliyuncs.com 阿里云短信 \ No newline at end of file +- epmet-cloud.elinkservice.cn 微信交互代理,第三方，客户等 +- dysmsapi.aliyuncs.com 阿里云短信 +- api.weixin.qq.com 微信直接交互（二维码等） +- oss-cn-qingdao.aliyuncs.com(如果需要用到oss) + + + +#### 腾讯云呼叫中心需要调用，需要开放 +- https://map.qq.com +- https://pr.map.qq.com +- https://webapi.amap.com +- https://tccc.qcloud.com +- https://aegis.qq.com +- https://api.tccc.qcloud.com +- wss://wss.im.qcloud.com +- https://tpstelemetry.tencent.com +- https://ccc.ap-shanghai.tencentcloudapi.com +- https://ccc.tencentcloudapi.com From bc27769823a34bd9ad08532493cf2632c9d4a139 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 12 May 2023 09:10:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=86=99=E7=82=B9=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/epmet-cloud.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/epmet-cloud.md b/doc/epmet-cloud.md index e2a5d270cf..18928176dc 100644 --- a/doc/epmet-cloud.md +++ b/doc/epmet-cloud.md @@ -4,11 +4,11 @@ ``` 开发环境已经搭建好了 在最新的代码中: - 默认情况下，所有服务的pom.xml中应该启用dev环境，其他环境的active应该被注释掉(dev-local不再有用，可以删除) + 默认情况下，所有服务的pom.xml中启用local环境，其他环境的active应该被注释掉 根据dev环境中的配置，微服务会注册到nacos，并且调用其他微服务的时候会从nacos中取目标微服务的ip来发送请求 因此，本地电脑不再需要启动所有服务，只需要启动要开发的服务即可；默认情况下，本机的微服务在调用目标微服务的时候，都是调用的服务器，不再请求本地。 例如：有A、B2个服务，并且A调用B，如果我们只需要开发A服务，那本地只启动A服务即可，A调用B的时候，会调用服务器的B服务。 -如果需要开发AB2个服务，那么将A中的FeignClient的url属性指向localhost。 +如果需要开发AB2个服务，那么将A中的FeignClient的url属性指向localhost:[B的端口]。 PS:目前正在测试通过负载均衡器和本地环境变量实现动态修改目标服务IP，成功之后就不需要再修改FeignClient的url，配置一下环境变量即可，到时候具体说 ``` From 6bf9d9732d4f83c5b49bf5d371353119ebd76a5e Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 15 May 2023 14:05:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=E6=A0=87=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9Etrue=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/ScanContentUtils.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index e04227d5dc..bf0bfb5ba5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java @@ -27,12 +27,59 @@ import java.util.stream.Collectors; **/ @Slf4j public class ScanContentUtils { + + // 内容审核是否可用。烟台是政务网，无法使用互联网，所以该功能不可用 + public static final Boolean USABLE = true; + + /** + * 模拟sync成功的结果(可以用来模拟，也可以适用于无法使用互联网的环境) + * @author wxz + * @date 2022/12/13 15:37 + * + * * @return Result + */ + public static Result mockSyncSuccessResult() { + Result tempRst = new Result<>(); + SyncScanResult syncScanResult = new SyncScanResult(); + syncScanResult.setAllPass(true); + tempRst.setData(syncScanResult); + return tempRst; + } + + /** + * 模拟async成功的结果(可以用来模拟，也可以适用于无法使用互联网的环境) + * @author wxz + * @date 2022/12/13 15:46 + * + * * @return Result + */ + public static Result mockAsyncSuccessResult() { + Result tempRst = new Result<>(); + AsyncScanResult asyncScanResult = new AsyncScanResult(); + asyncScanResult.setAllSuccess(true); + tempRst.setData(asyncScanResult); + return tempRst; + } + + public static Result mockVideoAsyncSuccessResult() { + Result tempRst = new Result<>(); + VideoAsyncScanResultDTO asyncScanResult = new VideoAsyncScanResultDTO(); + asyncScanResult.setIsAllPass(true); + tempRst.setData(asyncScanResult); + return tempRst; + } + /** * desc:图片同步扫描 * * @return */ public static Result imgSyncScan(String url, ImgScanParamDTO param) { + + if (!USABLE) { + return mockSyncSuccessResult(); + } + //start 测试环境停机了，先这样改试试 EnvEnum currentEnv = EnvEnum.getCurrentEnv(); if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){ @@ -68,6 +115,11 @@ public class ScanContentUtils { * @return */ public static Result textSyncScan(String url, TextScanParamDTO param) { + + if (!USABLE) { + return mockSyncSuccessResult(); + } + //start 测试环境停机了，先这样改试试 EnvEnum currentEnv = EnvEnum.getCurrentEnv(); if(EnvEnum.LOCAL.getCode().equals(currentEnv.getCode())||EnvEnum.DEV.getCode().equals(currentEnv.getCode())){ @@ -104,6 +156,11 @@ public class ScanContentUtils { * @return 返回检测对象对应的任务id */ public static Result voiceAsyncScan(String url, VoiceScanParamDTO param){ + + if (!USABLE) { + return mockAsyncSuccessResult(); + } + log.debug("voiceAsyncScan param:{}", JSON.toJSONString(param)); if (StringUtils.isBlank(url) || param == null) { throw new RenException("参数错误"); @@ -164,6 +221,11 @@ public class ScanContentUtils { * @description 异步检测-提交检测任务 **/ public static Result videoAsyncScan(String url, VideoScanParamDTO param){ + + if (!USABLE) { + return mockAsyncSuccessResult(); + } + log.debug("videoAsyncScan param:{}", JSON.toJSONString(param)); if (StringUtils.isBlank(url) || param == null) { throw new RenException("参数错误"); @@ -194,6 +256,11 @@ public class ScanContentUtils { * @description 查询视频检测结果 **/ public static Result videoResults(String url, List taskIds) { + + if (!USABLE) { + return mockVideoAsyncSuccessResult(); + } + if (StringUtils.isBlank(url) || CollectionUtils.isEmpty(taskIds)) { throw new RenException("参数错误"); } From 351a3bc6a1878569b385ab9efed5003b04f8ff13 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 15 May 2023 14:25:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=E6=A0=87=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9Etrue=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/utils/ScanContentUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java index bf0bfb5ba5..36f1d8ba12 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ScanContentUtils.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; public class ScanContentUtils { // 内容审核是否可用。烟台是政务网，无法使用互联网，所以该功能不可用 - public static final Boolean USABLE = true; + public static final Boolean USABLE = false; /** * 模拟sync成功的结果(可以用来模拟，也可以适用于无法使用互联网的环境) From 09d2005fb8533f935cc4dad32f3136cb7a50bed3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 15 May 2023 14:40:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1-=E9=A5=BC=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/form/OrgCommonFormDTO.java | 36 +++++++++++ .../DangerousChemicalsTypeStatResultDTO.java | 17 +++++ .../IcDangerousChemicalsController.java | 13 +++- .../service/IcDangerousChemicalsService.java | 9 +++ .../impl/IcDangerousChemicalsServiceImpl.java | 64 +++++++++++++++++-- 5 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/OrgCommonFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/OrgCommonFormDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/OrgCommonFormDTO.java new file mode 100644 index 0000000000..d4be5e3011 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/OrgCommonFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.commons.tools.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2023/5/15 13:44 + */ +@Data +public class OrgCommonFormDTO implements Serializable { + private static final long serialVersionUID = 2261315322260807610L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 组织id或者网格id + */ + @NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class) + private String orgId; + /** + * agency + * grid + */ + @NotBlank(message = "orgType不能为空", groups = AddUserInternalGroup.class) + private String orgType; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatResultDTO.java new file mode 100644 index 0000000000..3c814adf9b --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatResultDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description 灵山大屏-安全生产-生产企业类型统计 + * @Author yzm + * @Date 2023/5/15 13:48 + */ +@Data +public class DangerousChemicalsTypeStatResultDTO { + private String name; + private Integer value; + private String typeCode; + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index 5561fdcbaf..0d4bab7d0b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.form.OrgCommonFormDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -25,6 +26,7 @@ import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.excel.IcDangerousChemicalsExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.service.IcDangerousChemicalsService; @@ -288,5 +290,14 @@ public class IcDangerousChemicalsController { return new Result(); } - + /** + * 灵山大屏-安全生产-生产企业类型统计 + * + * @param formDto + * @return + */ + @PostMapping("type-stat") + public Result> typeStat(@RequestBody OrgCommonFormDTO formDto) { + return new Result>().ok(icDangerousChemicalsService.typeStat(formDto.getOrgId(), formDto.getOrgType())); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java index be86798fd5..d3963172c3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java @@ -7,6 +7,7 @@ import com.epmet.dto.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; import java.nio.file.Path; @@ -82,4 +83,12 @@ public interface IcDangerousChemicalsService extends BaseService entityList); IcDangerousChemicalsEntity get(String orgId, String name); + + /** + * 灵山大屏-安全生产-生产企业类型统计 + * @param orgId + * @param orgType + * @return + */ + List typeStat(String orgId, String orgType); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 4bb95cf9a0..8f0567c01c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -59,10 +60,7 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** @@ -115,7 +113,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 - List dictList = coverageService.dictMap(formDTO.getCustomerId(), "dangerous_chemicals"); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); for (IcDangerousChemicalsListResultDTO v : list) { if (StringUtils.isNotBlank(v.getCategory())) { @@ -225,7 +223,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl> statusRes = adminOpenFeignClient.dictMap(DictTypeEnum.IC_DANGER_TYPE.getCode()); Map statusMap = statusRes.success() && MapUtils.isNotEmpty(statusRes.getData()) ? statusRes.getData() : new HashMap<>(); //企业类别字典数据 - List dictList = coverageService.dictMap(formDTO.getCustomerId(), "city_management"); + List dictList = coverageService.dictMap(formDTO.getCustomerId(), CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); Map dictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); if (StringUtils.isNotBlank(resultDTO.getCategory())) { resultDTO.setCategoryName(dictMap.get(resultDTO.getCategory())); @@ -355,4 +353,58 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl typeStat(String orgId, String orgType) { + // 企业类别字典数据 + List dictList = coverageService.dictMap(EpmetRequestHolder.getLoginUserCustomerId(), CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); + if (CollectionUtils.isEmpty(dictList)) { + return new ArrayList<>(); + } + String orgIdPath = queryOrgIdPath(orgId, orgType); + if (StringUtils.isBlank(orgIdPath)) { + return new ArrayList<>(); + } + List resultList = new ArrayList<>(); + for (IcCoverageCategoryDictListResultDTO dto : dictList) { + DangerousChemicalsTypeStatResultDTO resultDTO = new DangerousChemicalsTypeStatResultDTO(); + resultDTO.setName(dto.getLabel()); + LambdaQueryWrapper countWrapper = new LambdaQueryWrapper<>(); + countWrapper.eq(IcDangerousChemicalsEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()) + .likeRight(IcDangerousChemicalsEntity::getOrgIdPath, orgIdPath) + .eq(IcDangerousChemicalsEntity::getCategory, dto.getValue()); + resultDTO.setValue(baseDao.selectCount(countWrapper)); + resultDTO.setTypeCode(dto.getValue()); + resultList.add(resultDTO); + } + return resultList; + } + + private String queryOrgIdPath(String orgId, String orgType) { + String orgIdPath = ""; + // 如果没传，默认查询当前工作人员所属组织 + if (StringUtils.isBlank(orgId) && StringUtils.isBlank(orgType)) { + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + orgId = staffInfoCacheResult.getAgencyId(); + orgType = OrgTypeEnum.AGENCY.getCode(); + } + if (OrgTypeEnum.AGENCY.getCode().equals(orgType)) { + CustomerAgencyDTO customerAgencyDTO = SpringContextUtils.getBean(CustomerAgencyService.class).get(orgId); + orgIdPath = PidUtils.convertPid2OrgIdPath(customerAgencyDTO.getId(), customerAgencyDTO.getPids()); + } else if (OrgTypeEnum.GRID.getCode().equals(orgType)) { + CustomerGridDTO customerGridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(orgId); + orgIdPath = PidUtils.convertPid2OrgIdPath(customerGridDTO.getId(), customerGridDTO.getPids()); + } + return orgIdPath; + } + + } \ No newline at end of file From 51113bdb38a5658f1c5c5c86399fe13626057c81 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 15 May 2023 15:32:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1-=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E5=88=97=E8=A1=A8=EF=BC=88=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=89=E9=80=9A=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DangerousChemicalsDistributionFormDTO.java | 15 +++++ .../DangerousChemicalsTypeStatDetailDTO.java | 56 +++++++++++++++++++ .../IcDangerousChemicalsController.java | 24 +++++++- .../epmet/dao/IcDangerousChemicalsDao.java | 11 ++++ .../service/IcDangerousChemicalsService.java | 14 ++++- .../impl/IcDangerousChemicalsServiceImpl.java | 44 +++++++++++++-- .../mapper/IcDangerousChemicalsDao.xml | 28 +++++++++- 7 files changed, 182 insertions(+), 10 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/DangerousChemicalsDistributionFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatDetailDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/DangerousChemicalsDistributionFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/DangerousChemicalsDistributionFormDTO.java new file mode 100644 index 0000000000..c106a76f18 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/DangerousChemicalsDistributionFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dto.form.lingshan; + +import com.epmet.commons.tools.dto.form.OrgCommonFormDTO; +import lombok.Data; + +/** + * @Description 灵山大屏-安全生产-生产企业类型统计，点击饼图，中间地图显示列表 + * @Author yzm + * @Date 2023/5/15 14:59 + */ +@Data +public class DangerousChemicalsDistributionFormDTO extends OrgCommonFormDTO { + private String typeCode; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatDetailDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatDetailDTO.java new file mode 100644 index 0000000000..10dcef96be --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/DangerousChemicalsTypeStatDetailDTO.java @@ -0,0 +1,56 @@ +package com.epmet.dto.result.lingshan; + +/** + * @Description 灵山大屏-安全生产-生产企业类型统计 点击饼图，列表及详情返参DTO + * @Author yzm + * @Date 2023/5/15 15:00 + */ + +import lombok.Data; + +@Data +public class DangerousChemicalsTypeStatDetailDTO { + /** + * 企业id + */ + private String id; + /** + * 企业名称 + */ + private String name; + /** + * 企业介绍 + */ + private String content; + private String longitude; + private String latitude; + private String addr; + /** + * 联系人 + */ + private String annt; + /** + * 联系电话 + */ + private String phone; + // @JsonIgnore + private String category; + + /** + * 类别名称 + */ + private String type; + /** + * 是否重点企业 + */ + private Boolean zd; + /** + * 包企领导 + */ + private String leader; + /** + * 包企干部 + */ + private String cadre; +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java index 0d4bab7d0b..3ec91f1896 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcDangerousChemicalsController.java @@ -24,8 +24,10 @@ import com.epmet.dto.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; +import com.epmet.dto.form.lingshan.DangerousChemicalsDistributionFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatDetailDTO; import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.excel.IcDangerousChemicalsExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -297,7 +299,25 @@ public class IcDangerousChemicalsController { * @return */ @PostMapping("type-stat") - public Result> typeStat(@RequestBody OrgCommonFormDTO formDto) { - return new Result>().ok(icDangerousChemicalsService.typeStat(formDto.getOrgId(), formDto.getOrgType())); + public Result> typeStat(@LoginUser TokenDto tokenDto, @RequestBody OrgCommonFormDTO formDto) { + return new Result>().ok(icDangerousChemicalsService.typeStat(tokenDto.getCustomerId(), + tokenDto.getUserId(), + formDto.getOrgId(), + formDto.getOrgType())); + } + + /** + * 灵山大屏-安全生产-生产企业类型统计,点击饼图，查询列表及详情 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("distribution") + public Result> distribution(@LoginUser TokenDto tokenDto, @RequestBody DangerousChemicalsDistributionFormDTO formDTO) { + return new Result>().ok(icDangerousChemicalsService.distribution(tokenDto.getCustomerId(), + tokenDto.getUserId(), + formDTO.getOrgId(), + formDTO.getOrgType(), + formDTO.getTypeCode())); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java index 1cc152c5f5..194eba8f2f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatDetailDTO; import com.epmet.entity.IcDangerousChemicalsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -24,4 +25,14 @@ public interface IcDangerousChemicalsDao extends BaseDao entityList); + /** + * 灵山大屏-安全生产-生产企业类型统计,点击饼图，查询列表及详情 + * @param customerId + * @param orgIdPath + * @param typeCode + * @return + */ + List selectDistributionList(@Param("customerId") String customerId, + @Param("orgIdPath") String orgIdPath, + @Param("typeCode") String typeCode); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java index d3963172c3..81e4da7937 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcDangerousChemicalsService.java @@ -7,6 +7,7 @@ import com.epmet.dto.IcDangerousChemicalsDTO; import com.epmet.dto.form.IcDangerousChemicalsAddEditFormDTO; import com.epmet.dto.form.IcDangerousChemicalsListFormDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatDetailDTO; import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; @@ -90,5 +91,16 @@ public interface IcDangerousChemicalsService extends BaseService typeStat(String orgId, String orgType); + List typeStat(String customerId,String staffId,String orgId, String orgType); + + /** + * 灵山大屏-安全生产-生产企业类型统计,点击饼图，查询列表及详情 + * @param customerId + * @param userId + * @param orgId + * @param orgType + * @param typeCode + * @return + */ + List distribution(String customerId, String staffId, String orgId, String orgType, String typeCode); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java index 8f0567c01c..d482ea2bf0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO; import com.epmet.dto.result.IcDangerousChemicalsListResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatDetailDTO; import com.epmet.dto.result.lingshan.DangerousChemicalsTypeStatResultDTO; import com.epmet.entity.IcDangerousChemicalsEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; @@ -363,13 +364,13 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl typeStat(String orgId, String orgType) { + public List typeStat(String customerId,String staffId,String orgId, String orgType) { // 企业类别字典数据 - List dictList = coverageService.dictMap(EpmetRequestHolder.getLoginUserCustomerId(), CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); + List dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); if (CollectionUtils.isEmpty(dictList)) { return new ArrayList<>(); } - String orgIdPath = queryOrgIdPath(orgId, orgType); + String orgIdPath = queryOrgIdPath(customerId,staffId,orgId, orgType); if (StringUtils.isBlank(orgIdPath)) { return new ArrayList<>(); } @@ -378,7 +379,7 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl countWrapper = new LambdaQueryWrapper<>(); - countWrapper.eq(IcDangerousChemicalsEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()) + countWrapper.eq(IcDangerousChemicalsEntity::getCustomerId, customerId) .likeRight(IcDangerousChemicalsEntity::getOrgIdPath, orgIdPath) .eq(IcDangerousChemicalsEntity::getCategory, dto.getValue()); resultDTO.setValue(baseDao.selectCount(countWrapper)); @@ -388,11 +389,11 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl distribution(String customerId, String staffId, String orgId, String orgType, String typeCode) { + // 企业类别字典数据 + List dictList = coverageService.dictMap(customerId, CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode()); + if (CollectionUtils.isEmpty(dictList)) { + return new ArrayList<>(); + } + Map categoryDictMap = dictList.stream().collect(Collectors.toMap(IcCoverageCategoryDictListResultDTO::getValue, IcCoverageCategoryDictListResultDTO::getLabel)); + String orgIdPath = queryOrgIdPath(customerId, staffId, orgId, orgType); + if (StringUtils.isBlank(orgIdPath)) { + return new ArrayList<>(); + } + List list = baseDao.selectDistributionList(customerId, orgIdPath, typeCode); + list.forEach(l -> { + // 赋值企业分类名称 + if (MapUtils.isNotEmpty(categoryDictMap) && categoryDictMap.containsKey(l.getCategory())) { + l.setType(categoryDictMap.get(l.getCategory())); + } + }); + return list; + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index 936cda737e..5258d85b78 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -143,5 +143,31 @@ AND del_flag = '0' - + + \ No newline at end of file