添加升压站查询告警

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

@@ -4,16 +4,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.AlarmEventDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.AlarmEvent;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AlarmEventMapper extends BaseMapper<AlarmEvent> {
 
-   String getLastDataBySort(String gatewayId);
+	String getLastDataBySort(String gatewayId);
 
+	List<AlarmEventDto> getAlarmEventList(String gatewayId, String stationId, long current, long size, Date time);
 
-   List <AlarmEventDto> getAlarmEventList(String gatewayId,String stationId);
-
-   List<String> getOldAlarmsBySort(String gatewayId, String sort);
-
+	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

@@ -1023,23 +1023,33 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
 
-    public ResultsData getAlarmEventList(int current, int size, String stationId) {
-
-        List<AlarmEventDto> alarmEventList = alarmEventMapper.getAlarmEventList(null, stationId);
+  public ResultsData getAlarmEventList(int current, int size, String stationId) {
+    	
+        LambdaQueryWrapper<AlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
+        if(stationId!=null) 
+        {
+            queryWrapper.eq(AlarmEvent::getStationId, stationId);
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_MONTH, -7);
+        queryWrapper.gt(AlarmEvent::getCreatedTime, calendar.getTime());
+        int count = alarmEventMapper.selectCount(queryWrapper);
+        
+        List<AlarmEventDto> alarmEventList = alarmEventMapper.getAlarmEventList(null, stationId,(current-1)*size,size,calendar.getTime());
 
         // List<AlarmEventDto> sorrtedAlarmEventList = alarmEventList.stream().sorted(Comparator.comparing(AlarmEventDto::getCreatedTime).reversed()).collect(Collectors.toList());
-        ArrayList<Map<String, String>> resultList = new ArrayList<>();
-        alarmEventList.forEach(item -> {
-            HashMap<String, String> stringStringHashMap = new HashMap<>();
-            stringStringHashMap.put("stationName", item.getStationName());
-            stringStringHashMap.put("eventDesc", item.getEventDesc());
-            stringStringHashMap.put("alarmGroupName", item.getAlarmGroupName());
-            stringStringHashMap.put("eventTime", item.getEventTime());
-            stringStringHashMap.put("eventMovement", item.getEventMovement());
-            resultList.add(stringStringHashMap);
-        });
+//        ArrayList<Map<String, String>> resultList = new ArrayList<>();
+//        alarmEventList.forEach(item -> {
+//            HashMap<String, String> stringStringHashMap = new HashMap<>();
+//            stringStringHashMap.put("stationName", item.getStationName());
+//            stringStringHashMap.put("eventDesc", item.getEventDesc());
+//            stringStringHashMap.put("alarmGroupName", item.getAlarmGroupName());
+//            stringStringHashMap.put("eventTime", item.getEventTime());
+//            stringStringHashMap.put("eventMovement", item.getEventMovement());
+//            resultList.add(stringStringHashMap);
+//        });
         //构建平台数据
-        DataGridMock DataGridMock = new DataGridMock(current, resultList.size(), false, current, resultList);
+        DataGridMock DataGridMock = new DataGridMock(current, count, false, current, alarmEventList);
         ColModel colModelStationName = new ColModel("stationName", "stationName", "名称", "名称", "dataGrid", "stationName");
         ColModel colModelEventDesc = new ColModel("eventDesc", "eventDesc", "事件描述", "事件描述", "dataGrid", "eventDesc");
         ColModel colModelAlarmGroupName = new ColModel("alarmGroupName", "alarmGroupName", "事件告警组", "事件告警组", "dataGrid", "alarmGroupName");

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

@@ -15,15 +15,15 @@
         from
              fault_alarm_event
         <where>
-              <if test="gatewayId != null and gatewayId != ''">
-                  gateway_id = #{gatewayId}
-              </if>
+            <if test="gatewayId != null and gatewayId != ''">
+                gateway_id = #{gatewayId}
+            </if>
             <if test="stationId != null and stationId != ''">
                 station_id = #{stationId}
             </if>
-            AND DATE_SUB(CURDATE(), INTERVAL 6 DAY) &lt;= event_time
+            AND #{time} &lt;= event_time
         </where>
-        order by event_time desc
+        ORDER BY event_time DESC LIMIT #{current}, #{size} 
     </select>