From 560db4298f3a81a092a2fd216c1bb306ef159bac Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 24 Jul 2025 14:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interceptor/ParamSecureHandler.java | 2 ++ .../EngineeringSafetyAnalysisController.java | 31 ++++++++++++++++--- .../EngineeringSafetyAnalysisMapper.java | 16 ++++++++++ .../EngineeringSafetyAnalysisService.java | 16 ++++++++++ .../EngineeringSafetyAnalysisServiceImpl.java | 10 ++++++ .../EngineeringSafetyAnalysisMapper.xml | 25 +++++++++++++-- 6 files changed, 93 insertions(+), 7 deletions(-) diff --git a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java index 71d1e41..a01ecd3 100644 --- a/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java +++ b/securitycontrol-commons/securitycontrol-commons-security/src/main/java/com/securitycontrol/common/security/interceptor/ParamSecureHandler.java @@ -73,6 +73,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor { "/largeScreen/engineeringSafetyAnalysis/list", "/largeScreen/engineeringSafetyAnalysis/environmental", "/largeScreen/engineeringSafetyAnalysis/hazards", + "/largeScreen/engineeringSafetyAnalysis/getEnvironmentalList", + "/largeScreen/engineeringSafetyAnalysis/getHazardsList", "/Dashapi/pages/dashInfo", "/largeScreen/deviceEnergyAnalysis/selectEnergyStatsByDateRange", "/largeScreen/deviceEnergyAnalysis/selectDeviceEnergyByDateRange", diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EngineeringSafetyAnalysisController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EngineeringSafetyAnalysisController.java index 6db872a..4475a92 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EngineeringSafetyAnalysisController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/EngineeringSafetyAnalysisController.java @@ -41,9 +41,9 @@ public class EngineeringSafetyAnalysisController extends BaseController { } /** - * 查询环境监测趋势列表 + * 查询环境监测趋势 */ - @ApiOperation(value = "查询环境监测趋势列表") + @ApiOperation(value = "查询环境监测趋势") @GetMapping("/environmental") public TableDataInfo environmental(EngineeringSafetyAnalysis environmentalReadings) { List list = environmentalReadingsService.environmentalList(environmentalReadings); @@ -51,12 +51,35 @@ public class EngineeringSafetyAnalysisController extends BaseController { } /** - * 查询安全隐患分布列表 + * 查询安全隐患分布 */ - @ApiOperation(value = "查询安全隐患分布列表") + @ApiOperation(value = "查询安全隐患分布") @GetMapping("/hazards") public TableDataInfo hazards(EngineeringSafetyAnalysis environmentalReadings) { List list = environmentalReadingsService.hazardsList(environmentalReadings); return getDataTable(list); } + + + /** + * 查询环境监测趋势列表 + */ + @ApiOperation(value = "查询环境监测趋势列表") + @GetMapping("/getEnvironmentalList") + public TableDataInfo getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) { + startPage(); + List list = environmentalReadingsService.getEnvironmentalList(environmentalReadings); + return getDataTable(list); + } + + /** + * 查询安全隐患分布列表 + */ + @ApiOperation(value = "查询安全隐患分布列表") + @GetMapping("/getHazardsList") + public TableDataInfo getHazardsList(EngineeringSafetyAnalysis environmentalReadings) { + startPage(); + List list = environmentalReadingsService.getHazardsList(environmentalReadings); + return getDataTable(list); + } } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EngineeringSafetyAnalysisMapper.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EngineeringSafetyAnalysisMapper.java index 1f697e2..b8939d2 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EngineeringSafetyAnalysisMapper.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/EngineeringSafetyAnalysisMapper.java @@ -35,4 +35,20 @@ public interface EngineeringSafetyAnalysisMapper { * @return 安全隐患集合发布 */ List hazardsList(EngineeringSafetyAnalysis environmentalReadings); + + /** + * 查询环境监测趋势列表 + * + * @param environmentalReadings 环境监测趋势 + * @return 环境监测趋势 + */ + List getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings); + + /** + * icherry 查询安全隐患发布列表 + * + * @param environmentalReadings 安全隐患发布 + * @return 安全隐患集合发布 + */ + List getHazardsList(EngineeringSafetyAnalysis environmentalReadings); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EngineeringSafetyAnalysisService.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EngineeringSafetyAnalysisService.java index 5bf993d..37cc17b 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EngineeringSafetyAnalysisService.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/EngineeringSafetyAnalysisService.java @@ -34,4 +34,20 @@ public interface EngineeringSafetyAnalysisService { * @return 安全隐患发布集合 */ List hazardsList(EngineeringSafetyAnalysis environmentalReadings); + + /** + * 查询环境监测趋势列表 + * + * @param environmentalReadings 查询环境监测趋势列表 + * @return 环境监测趋势集合 + */ + List getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings); + + /** + * 查询安全隐患发布列表 + * + * @param environmentalReadings 查询安全隐患发布列表 + * @return 安全隐患发布集合 + */ + List getHazardsList(EngineeringSafetyAnalysis environmentalReadings); } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EngineeringSafetyAnalysisServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EngineeringSafetyAnalysisServiceImpl.java index 97f0491..e9fd169 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EngineeringSafetyAnalysisServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/EngineeringSafetyAnalysisServiceImpl.java @@ -52,5 +52,15 @@ public class EngineeringSafetyAnalysisServiceImpl implements EngineeringSafetyAn return engineeringSafetyAnalysisMapper.hazardsList(environmentalReadings); } + @Override + public List getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) { + return engineeringSafetyAnalysisMapper.getEnvironmentalList(environmentalReadings); + } + + @Override + public List getHazardsList(EngineeringSafetyAnalysis environmentalReadings) { + return engineeringSafetyAnalysisMapper.getHazardsList(environmentalReadings); + } + } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml index 92ff280..143c749 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hazards h LEFT JOIN tb_project_new pro on h.bid_code = pro.bid_code LEFT JOIN - monitoring_points mp ON h.bid_code = mp.bid_code + monitoring_points mp ON h.monitoring_point_id = mp.id LEFT JOIN ( -- 子查询：获取每个 bid_code 最新日期的环境数据平均值 @@ -105,7 +105,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hazards WHERE bid_code = #{bidCode} - GROUP BY - level + GROUP BY level + + + + + + \ No newline at end of file