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;
+    }
 }

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') )

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
+        group by ammeterDate,t.date_month,t.date_day
-        order by ammeterDate
+        order by t.date_month desc, t.date_day desc
     </select>
 
     <select id="getPcsTotalChargeData" resultType="map">