From 2b0373057a8817a4ec02bdecaf4e2e8f2cc93a49 Mon Sep 17 00:00:00 2001
From: fl <3098731433@qq.com>
Date: Wed, 23 Jul 2025 23:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/screen/dto/EnvironmentDto.java     |  5 ++-
 .../resources/mapper/EnvironmentMapper.xml    | 45 ++++++++-----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java
index 64dbecb..c57f1a1 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/EnvironmentDto.java
@@ -16,7 +16,10 @@ public class EnvironmentDto extends ScreenParamDto {
     private String currentDay;
 
     @ApiModelProperty(value = "时辰")
-    private String hours;
+    private String hour;
+
+    @ApiModelProperty(value = "工程名称")
+    private String proId;
 
     @ApiModelProperty(value = "工程名称")
     private String proName;
diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml
index 5578504..d08d035 100644
--- a/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml
+++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/EnvironmentMapper.xml
@@ -5,22 +5,22 @@
     <select id="getEnvironmentList" resultType="com.securitycontrol.entity.screen.dto.EnvironmentDto">
         SELECT
         id,
-        pro_id,
-        current_day,
+        pro_id as proId,
+        current_day as currentDay,
         `hour`,
-        slope_displacement,
+        slope_displacement as slopeDisplacement,
         temperature,
         humidity,
-        air_quality_index,
-        noise_level,
+        air_quality_index as airQualityIndex,
+        noise_level as noiseLevel,
         illumination,
-        gis_installation_temp,
-        gis_installation_humidity,
-        gis_installation_dust_concentration,
-        confined_space_oxygen,
-        confined_space_carbon_monoxide,
-        confined_space_hydrogen_sulfide,
-        confined_space_combustible_gas
+        gis_installation_temp as gisInstallationTemp,
+        gis_installation_humidity as gisInstallationHumidity,
+        gis_installation_dust_concentration as gisInstallationDustConcentration,
+        confined_space_oxygen as confinedSpaceOxygen,
+        confined_space_carbon_monoxide as confinedSpaceCarbonMonoxide,
+        confined_space_hydrogen_sulfide as confinedSpaceHydrogenSulfide,
+        confined_space_combustible_gas as confinedSpaceCombustibleGas
         FROM
         wide_sensor_data
         WHERE
@@ -30,20 +30,13 @@
     </select>
     <select id="getEnvironmentListByDate" resultType="com.securitycontrol.entity.screen.dto.EnvironmentDto">
         SELECT
-        current_day,
-        AVG(slope_displacement) AS avg_slope_displacement,
-        AVG(temperature) AS avg_temperature,
-        AVG(humidity) AS avg_humidity,
-        AVG(air_quality_index) AS avg_air_quality_index,
-        AVG(noise_level) AS avg_noise_level,
-        AVG(illumination) AS avg_illumination,
-        AVG(gis_installation_temp) AS avg_gis_installation_temp,
-        AVG(gis_installation_humidity) AS avg_gis_installation_humidity,
-        AVG(gis_installation_dust_concentration) AS avg_gis_installation_dust_concentration,
-        AVG(confined_space_oxygen) AS avg_confined_space_oxygen,
-        AVG(confined_space_carbon_monoxide) AS avg_confined_space_carbon_monoxide,
-        AVG(confined_space_hydrogen_sulfide) AS avg_confined_space_hydrogen_sulfide,
-        AVG(confined_space_combustible_gas) AS avg_confined_space_combustible_gas
+        current_day as currentDay,
+        AVG(slope_displacement) AS slopeDisplacement,
+        AVG(temperature) AS temperature,
+        AVG(humidity) AS humidity,
+        AVG(air_quality_index) AS airQualityIndex,
+        AVG(noise_level) AS noiseLevel,
+        AVG(illumination) AS illumination
         FROM
         wide_sensor_data
         WHERE