From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 11 十月 2024 08:39:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java index 5e73260..0118321 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java @@ -127,6 +127,10 @@ //宸ヤ綅淇℃伅 List<UpWorkstation> upWorkstations = upWorkstationService.list(); jsonObject.append("list", upWorkstations); + //鏄惁寮�濮嬪伐绋� + Engineering engineering = engineeringService.selectInitiate(1); + jsonObject.append("engineering", engineering); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { @@ -162,6 +166,26 @@ } } } + @Scheduled(fixedDelay = 1000) + public void loadGlassIsRun() { + JSONObject jsonObject = new JSONObject(); + //鏄惁寮�濮嬪伐绋� + Engineering engineering = engineeringService.selectInitiate(1); + jsonObject.append("engineering", engineering); + //宸ヤ綅淇℃伅 + List<UpWorkstation> upWorkstations = upWorkstationService.list(); + jsonObject.append("list", upWorkstations); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun"); + if (sendwServer != null) { + for (WebSocketServer webserver : sendwServer) { + if (webserver != null) { + webserver.sendMessage(jsonObject.toString()); + } else { + log.info("Home is closed"); + } + } + } + } public void overTask(String loadStatus, int state) { -- Gitblit v1.8.0