diff --git a/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java b/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java index d889558..396320d 100644 --- a/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java +++ b/CentralizedMonitoring/src/main/java/com/nmgs/controller/WebSocketController.java @@ -51,7 +51,7 @@ public class WebSocketController { } else if (command.equals("close")) { portInfoSocketAsyncService.removeIsOpen(socketId + resultMap.get("staNoPortNo").toString()); } else if (command.equals("Untitled")) { - portInfoSocketAsyncService.getUntitled(resultMap.get("manNo").toString(), session, resultMap.get("staNo").toString()); + portInfoSocketAsyncService.getUntitled(resultMap.get("manNo").toString(), session, resultMap.get("staNo").toString(),Boolean.parseBoolean(resultMap.get("isFirst").toString()) ); } else if (command.equals("closeUntitled")) { portInfoSocketAsyncService.closeUntitled(); } diff --git a/CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java b/CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java index 3c59c28..084f105 100644 --- a/CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java +++ b/CentralizedMonitoring/src/main/java/com/nmgs/service/PortInfoSocketAsyncService.java @@ -125,8 +125,10 @@ public class PortInfoSocketAsyncService { public List staList = new ArrayList<>(); @Async("CentralizedMonitoringThreadPool") - public void getUntitled(String manNo, Session session, String staNo) { - reloadUntitledMap(manNo); + public void getUntitled(String manNo, Session session, String staNo, boolean isFirst) { + if (isFirst) { + reloadUntitledMap(manNo); + } List> List = getUntitledByDB(dbMap, staNo); if (List != null && List.size() > 0) { WebsocketUtil.sendMessage(session, getSocketResult("", "Untitled", JSONArray.toJSONString(List))); @@ -184,6 +186,9 @@ public class PortInfoSocketAsyncService { } } } +// o1.compareToo2 升序 +// o2.compareToo1 降序 + list.sort((o1, o2) -> o2.get("datemark").compareTo(o1.get("datemark"))); return list; } } diff --git a/CentralizedMonitoring/src/main/resources/static/View/index.html b/CentralizedMonitoring/src/main/resources/static/View/index.html index c1fbc29..e43cbab 100644 --- a/CentralizedMonitoring/src/main/resources/static/View/index.html +++ b/CentralizedMonitoring/src/main/resources/static/View/index.html @@ -5,7 +5,7 @@ - + diff --git a/CentralizedMonitoringView/.idea/workspace.xml b/CentralizedMonitoringView/.idea/workspace.xml index cac21d6..851ec4f 100644 --- a/CentralizedMonitoringView/.idea/workspace.xml +++ b/CentralizedMonitoringView/.idea/workspace.xml @@ -2,8 +2,16 @@ - - + + + + + + + + + +