From 3d07e2187d3ce7e1555e29463e1e41c94f5a894e Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 24 Jul 2025 19:01:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EngineeringSafetyAnalysisController.java | 6 +- .../EngineeringSafetyAnalysisMapper.xml | 91 +++++++++++-------- 2 files changed, 58 insertions(+), 39 deletions(-) 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 08f282e..7f32539 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 @@ -35,7 +35,7 @@ public class EngineeringSafetyAnalysisController extends BaseController { @ApiOperation(value = "查询安全隐患列表") @GetMapping("/list") public TableDataInfo list(EngineeringSafetyAnalysis environmentalReadings) { - startPage(); + startLayPage(); List list = environmentalReadingsService.selectEnvironmentalReadingsList(environmentalReadings); return getDataTableLayui(list); } @@ -67,7 +67,7 @@ public class EngineeringSafetyAnalysisController extends BaseController { @ApiOperation(value = "查询环境监测趋势列表") @GetMapping("/getEnvironmentalList") public TableDataInfo getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) { - startPage(); + startLayPage(); List list = environmentalReadingsService.getEnvironmentalList(environmentalReadings); return getDataTableLayui(list); } @@ -78,7 +78,7 @@ public class EngineeringSafetyAnalysisController extends BaseController { @ApiOperation(value = "查询安全隐患分布列表") @GetMapping("/getHazardsList") public TableDataInfo getHazardsList(EngineeringSafetyAnalysis environmentalReadings) { - startPage(); + startLayPage(); List list = environmentalReadingsService.getHazardsList(environmentalReadings); return getDataTableLayui(list); } 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 143c749..d592c37 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EngineeringSafetyAnalysisMapper.xml @@ -26,6 +26,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT date, - AVG(temperature) AS temperature, - AVG(humidity) AS humidity, - AVG(wind_speed) AS wind_speed, - AVG(gas_value) AS gas_value + temperature , + humidity , + wind_speed , + gas_value FROM environmental_readings WHERE bid_code = #{bidCode} - GROUP BY - date ORDER BY date ASC @@ -109,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT id,date,temperature,humidity,wind_speed,gas_value FROM environmental_readings WHERE bid_code = #{bidCode} @@ -119,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY date ASC - SELECT id,type,level,timestamp FROM hazards WHERE bid_code = #{bidCode} From 84cf9bf68742d0428bc6f0e0cfca97b86d6eace3 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 24 Jul 2025 19:16:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/securitycontrol/entity/screen/vo/ProjectQualityVo.java | 1 + .../src/main/resources/mapper/DataAnalysisMapper.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java index 12e0297..fd2c6d8 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/ProjectQualityVo.java @@ -25,4 +25,5 @@ public class ProjectQualityVo { // 不合格率 private String noPassRate; private String unqualifiedItems; + private String checkItems; } diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml index 8d039d3..a485122 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/DataAnalysisMapper.xml @@ -39,6 +39,7 @@ SELECT device_name AS deviceName, - SUM(consumption_kwh) AS consumptionKwh + SUM(consumption_kwh) AS consumptionKwh, + SUM(renewable_used_kwh * 0.997) AS renewableUsedKwh FROM device_energy_analysis WHERE stat_date BETWEEN #{startDate} AND #{endDate} and pro_id = #{proId} @@ -53,26 +54,4 @@ - - - - - From acab335b968ca0b87234971ea8e96b58dd1dd44c Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 24 Jul 2025 19:50:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=A9=E7=94=A8?= =?UTF-8?q?=E7=8E=87=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ResourceMapperBack.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ResourceMapperBack.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ResourceMapperBack.xml index 6f8921f..78f73f8 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ResourceMapperBack.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/ResourceMapperBack.xml @@ -45,7 +45,6 @@ AND ri.type = #{resourceType} - AND ru.record_time = ( SELECT MAX(record_time) FROM resource_utilization