From 5e4b0e1e71c9a5bd46d191af56b9517881d12475 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 13 三月 2025 08:43:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 5323dd5..8190839 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
@@ -175,7 +175,12 @@
List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
jsonObject.append("stationOne", stationOneList);
jsonObject.append("stationTwo", stationTwoList);
-
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -218,6 +223,7 @@
String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -230,26 +236,21 @@
}
}
- @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("loadGlassIsRun is closed");
- }
- }
- }
- }
+// @Scheduled(fixedDelay = 1000)
+// public void loadGlassIsRun() {
+// JSONObject jsonObject = new JSONObject();
+//
+// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
+// if (sendwServer != null) {
+// for (WebSocketServer webserver : sendwServer) {
+// if (webserver != null) {
+// webserver.sendMessage(jsonObject.toString());
+// } else {
+// log.info("loadGlassIsRun is closed");
+// }
+// }
+// }
+// }
public void overTask(String loadStatus, int state) {
--
Gitblit v1.8.0