From 95db3e96a9465f137fdf16540e0c5985752894c2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java b/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
index eba16ae..266169e 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
@@ -1,17 +1,22 @@
package com.mes.service;
+import cn.hutool.json.JSONObject;
import com.mes.tools.WebSocketServer;
import org.springframework.stereotype.Component;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import java.util.ArrayList;
import java.util.function.Supplier;
@Component
public class Plchome extends Thread {
private int i = 1;
- private final Supplier<PlcService> plcServiceSupplier;
+ private static final Logger log = LogManager.getLogger(Plchome.class);
+
+ private final Supplier<DownGlassLogic> plcServiceSupplier;
public Plchome() {
- this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(PlcService.class);
+ this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownGlassLogic.class);
}
@@ -22,7 +27,7 @@
try {
i++;
Thread.sleep(100);
- PlcService plcService = plcServiceSupplier.get();
+ DownGlassLogic plcService = plcServiceSupplier.get();
// plcService.performPlcActions();
//plcService.unloadpush();
@@ -32,13 +37,24 @@
//褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑閭ｆ潯璁板綍鍒犳帀 宸ヤ綅琛ㄦ祦绋嬪崱缁戝畾浜嗘灦瀛�
- plcService.down_workstation();
+ plcService.downWorkstation();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
e.printStackTrace();
}
+
+ JSONObject jsonObject = new JSONObject();
+ // System.out.println(arraylist6);
+ jsonObject.append("data", 1);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+ log.info("鍑嗗鍚� WebSocket 鏈嶅姟鍣ㄥ彂閫佹秷鎭�: {}", jsonObject.toString());
+ }}
+
}
}
}
--
Gitblit v1.8.0