修改代码

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/AlarmEventMapper.java

@@ -11,7 +11,7 @@ public interface AlarmEventMapper extends BaseMapper<AlarmEvent> {
    String getLastDataBySort(String gatewayId);
 
 
-   List <AlarmEventDto> getAlarmEventList(String gatewayId,String stationId,int current, int size);
+   List <AlarmEventDto> getAlarmEventList(String gatewayId,String stationId);
 
    List<String> getOldAlarmsBySort(String gatewayId, String sort);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -961,7 +961,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public ResultsData getAlarmEventList(int current, int size, String stationId) {
 
-        List<AlarmEventDto> alarmEventList = alarmEventMapper.getAlarmEventList(null, stationId, current, size);
+        List<AlarmEventDto> alarmEventList = alarmEventMapper.getAlarmEventList(null, stationId);
 
         // List<AlarmEventDto> sorrtedAlarmEventList = alarmEventList.stream().sorted(Comparator.comparing(AlarmEventDto::getCreatedTime).reversed()).collect(Collectors.toList());
         ArrayList<Map<String, String>> resultList = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/AlarmEventMapper.xml

@@ -22,7 +22,7 @@
                 station_id = #{stationId}
             </if>
         </where>
-        order by sort desc limit #{current},#{size}
+        order by event_time desc
     </select>