[update] 故障告警 信号服务添加时间倒序

signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java

@@ -598,6 +598,7 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
         } else {
             result = signalFaultInfoVOS;
         }
+        result = result.stream().sorted(Comparator.comparing(SignalFaultInfoVO::getStartTime).reversed()).collect(Collectors.toList());
         return result;
     }
 

signal-control-service/src/main/java/net/wanji/web/task/SystemServiceStatusTask.java

@@ -14,7 +14,10 @@ import org.springframework.stereotype.Component;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author duanruiming
@@ -27,9 +30,9 @@ public class SystemServiceStatusTask {
     public static final List<SystemServiceStatusDTO> sysList = new ArrayList<SystemServiceStatusDTO>();
 
     static {
-        sysList.add(new SystemServiceStatusDTO("MYSQL", "10.102.1.182", 3306, 30000, 0, null));
-        sysList.add(new SystemServiceStatusDTO("UTC", "10.102.1.182", 32000, 30000, 0, null));
-        sysList.add(new SystemServiceStatusDTO("海康", "10.102.1.183", 80, 30000, 0, null));
+        sysList.add(new SystemServiceStatusDTO("MYSQL", "10.102.1.182", 3306, 30000, 0, null, null));
+        sysList.add(new SystemServiceStatusDTO("UTC", "10.102.1.182", 32000, 30000, 0, null, null));
+        sysList.add(new SystemServiceStatusDTO("海康", "10.102.1.183", 80, 30000, 0, null, null));
     }
 
     @Scheduled(fixedRate = 1 * 60 * 1000)
@@ -48,9 +51,11 @@ public class SystemServiceStatusTask {
                 LocalTime now = LocalTime.now();
                 String format = now.format(DateTimeFormatter.ofPattern(DateStyle.HH_MM_SS.getValue()));
                 dto.setStartTime(format);
+                dto.setStartDate(new Date());
             }
         }
-
-        WebSocketServer.sendInfo2All(JSON.toJSONString(sysList), Constant.WEBSOCKET_TOPIC_SYS_SERVICE_STATUS);
+        List<SystemServiceStatusDTO> sort = sysList.stream().sorted(Comparator.comparing(SystemServiceStatusDTO::getStartDate)).collect(Collectors.toList());
+        WebSocketServer.sendInfo2All(JSON.toJSONString(sort), Constant.WEBSOCKET_TOPIC_SYS_SERVICE_STATUS);
     }
+
 }

wj-common/src/main/java/net/wanji/common/dto/SystemServiceStatusDTO.java

@@ -6,6 +6,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+
 /**
  * @author duanruiming
  * @date 2023/03/21 10:45
@@ -27,4 +29,6 @@ public class SystemServiceStatusDTO {
     private int status;
     @ApiModelProperty(value = "开始时间",notes = "")
     private String startTime;
+    @ApiModelProperty(value = "开始日期",notes = "")
+    private Date startDate;
 }