[update] 信号服务优化时间排序

signal-control-service/src/main/java/net/wanji/web/controller/SituationDetectionController.java

@@ -3,6 +3,7 @@ package net.wanji.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.wanji.common.annotation.aspect.AspectLog;
+import net.wanji.common.dto.SystemServiceStatusDTO;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.vo.CrossDeviceStatusInfoOutVO;
@@ -15,9 +16,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.ws.rs.core.MediaType;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -242,7 +245,10 @@ public class SituationDetectionController extends BaseController {
     @GetMapping("/signalService")
     public JsonViewObject signalService() throws Exception {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
-        return jsonViewObject.success(SystemServiceStatusTask.sysList);
+        List<SystemServiceStatusDTO> sysList = SystemServiceStatusTask.sysList;
+        List<SystemServiceStatusDTO> sort = sysList.stream().
+                sorted(Comparator.comparing(SystemServiceStatusDTO::getStartDate)).collect(Collectors.toList());
+        return jsonViewObject.success(sort);
     }
 
 }

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

@@ -55,7 +55,7 @@ public class SystemServiceStatusTask {
                 }
             }
             List<SystemServiceStatusDTO> sort = sysList.stream().
-                    sorted(Comparator.comparing(SystemServiceStatusDTO::getStartDate).reversed()).collect(Collectors.toList());
+                    sorted(Comparator.comparing(SystemServiceStatusDTO::getStartDate)).collect(Collectors.toList());
             WebSocketServer.sendTopicInfo2All(JSON.toJSONString(sort), Constant.WEBSOCKET_TOPIC_SYS_SERVICE_STATUS);
         }
     }