From eb72542b6784e1864c86cc29b27ab0c5444ed7b6 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Mon, 11 Aug 2025 19:56:51 +0800
Subject: [PATCH] =?UTF-8?q?20250808=E4=BC=98=E5=8C=96-=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzzn/ems/domain/vo/AlarmRecordListRequestVo.java  | 11 +++++++++++
 .../resources/mapper/ems/EmsAlarmRecordsMapper.xml    |  3 +++
 .../main/resources/mapper/ems/EmsPcsDataMapper.xml    |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListRequestVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListRequestVo.java
index fccc19d..a6179f3 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListRequestVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListRequestVo.java
@@ -23,6 +23,9 @@ public class AlarmRecordListRequestVo {
     /** 告警结束时间 */
     private String alarmEndTime;
 
+    /** 设备id */
+    private String deviceId;
+
     public String getSiteId() {
         return siteId;
     }
@@ -62,4 +65,12 @@ public class AlarmRecordListRequestVo {
     public void setAlarmEndTime(String alarmEndTime) {
         this.alarmEndTime = alarmEndTime;
     }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
 }
diff --git a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
index 6b5fec8..9e8ed76 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml
@@ -159,6 +159,9 @@
         <if test="alarmLevel != null and alarmLevel != ''">
             AND t.alarm_level = #{alarmLevel}
         </if>
+        <if test="deviceId != null and deviceId != ''">
+            AND t.device_id = #{deviceId}
+        </if>
         <if test="alarmStartTime != null and alarmStartTime != null and alarmEndTime != null and alarmEndTime != ''">
             AND (date_format(t.alarm_start_time,'%Y%m%d') BETWEEN date_format(#{alarmStartTime},'%Y%m%d') and date_format(#{alarmEndTime},'%Y%m%d')
             or date_format(t.alarm_end_time,'%Y%m%d') BETWEEN date_format(#{alarmStartTime},'%Y%m%d') and date_format(#{alarmEndTime},'%Y%m%d') )
diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
index 7ea97fe..293694d 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml
@@ -313,8 +313,8 @@
             AND t.date_month = latest.date_month
             AND t.date_day = latest.date_day
             AND t.data_update_time = latest.max_update_time
-        group by ammeterDate
-        order by ammeterDate
+        group by ammeterDate,t.date_month,t.date_day
+        order by t.date_month desc, t.date_day desc
     </select>
 
     <select id="getPcsTotalChargeData" resultType="map">