From c5a2b71990cabc221834b856c99954677f1b5646 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 06 八月 2024 10:03:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java index e0a91f0..4a9356e 100644 --- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java +++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java @@ -76,7 +76,7 @@ //姝e湪杩涜鐨勪换鍔� List<TemperingGlassInfo>temperingTaskType=temperingAgoService.selectTaskType(); jsonObject.append("temperingTaskType", temperingTaskType); - ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun"); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { if (webserver != null) { -- Gitblit v1.8.0