From c95e05f131ecc15d0ae0454db79cf8418e248442 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Thu, 2 Mar 2023 19:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnvironmentAlarmController.java           |  2 +-
 .../entity/ProjectTodayAlarmInfoDetailQO.java |  5 ++++-
 .../mapper/xml/EnvironmentAlarmMapper.xml     | 20 ++++++++++---------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java
index ab3941d84..1d9d66fb6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/controller/EnvironmentAlarmController.java
@@ -114,7 +114,7 @@ public class EnvironmentAlarmController {
       */
      @ApiOperation(value = "查询某个项目今日PM10报警/预警情况", notes = "查询某个项目今日PM10报警/预警情况", httpMethod = "POST")
      @PostMapping(value = "/queryProjectTodayAlarmInfoDetail")
-     public Result<ProjectTodayAlarmInfoDetailVo> queryProjectTodayAlarmInfoDetail(ProjectTodayAlarmInfoDetailQO qo) {
+     public Result<ProjectTodayAlarmInfoDetailVo> queryProjectTodayAlarmInfoDetail(@RequestBody @Validated ProjectTodayAlarmInfoDetailQO qo) {
          return Result.success(environmentAlarmService.queryProjectTodayAlarmInfoDetail(qo));
      }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java
index 37cd4d1f0..a668ddc60 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/ProjectTodayAlarmInfoDetailQO.java
@@ -4,9 +4,12 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 @ApiModel("查询某个项目今日PM10报警/预警情况")
 public class ProjectTodayAlarmInfoDetailQO {
-    @ApiModelProperty(value = "所属项目SN")
+    @ApiModelProperty(value = "所属项目SN", required = true)
+    @NotBlank
     private String projectSn;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
index 7b9eef1ff..5122fe91f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
@@ -339,7 +339,7 @@
     </select>
     <select id="queryDeviceTodayAvgData" resultType="com.zhgd.xmgl.modules.environment.entity.Pm10TodayData"
             parameterType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailQO">
-        SELECT AVG(dnd.pm10),
+        SELECT AVG(dnd.pm10) pm10,
                dnd.upload_date
         FROM dust_noise_data dnd
         WHERE dnd.project_sn = #{projectSn}
@@ -349,14 +349,16 @@
     <select id="queryDeviceTodayAlramSum"
             resultType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmInfoDetailVo">
         SELECT IFNULL(SUM(
-                              IF
-                                  (ea.type = 1, 1, 0)), 0) pm10_device_today_alarm_sum,
-               IFNULL(SUM(
-                              IF
-                                  (ea.type = 0, 1, 0)), 0) pm10_device_today_pre_alarm_sum
+        IF
+        (ea.type = 1, 1, 0)), 0) pm10_device_today_alarm_sum,
+        IFNULL(SUM(
+        IF
+        (ea.type = 0, 1, 0)), 0) pm10_device_today_pre_alarm_sum
         FROM environment_alarm ea
-        WHERE DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
-          AND ea.alarm_type_id = 2
-          AND ea.project_sn = #{projectSn}
+        <where>
+            DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
+            AND ea.alarm_type_id = 2
+            AND ea.project_sn = #{projectSn}
+        </where>
     </select>
 </mapper>
\ No newline at end of file