From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
index e9885db..4969337 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plchome.java
@@ -1,25 +1,31 @@
package com.mes.common;
import cn.hutool.json.JSONObject;
-import com.mes.downworkstation.service.DownGlassLogic;
+
+import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.tools.WebSocketServer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.function.Supplier;
@Component
public class Plchome extends Thread {
private int i = 1;
private static final Logger log = LogManager.getLogger(Plchome.class);
+ @Autowired
+ private DownWorkstationService downWorkstationService;
- private final Supplier<DownGlassLogic> plcServiceSupplier;
+ // private final Supplier<DownGlassLogic> plcServiceSupplier;
- public Plchome() {
- this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownGlassLogic.class);
- }
+// public Plchome() {
+// this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownGlassLogic.class);
+// }
@Override
@@ -27,16 +33,19 @@
while (!Thread.currentThread().isInterrupted()) {
try {
i++;
- Thread.sleep(100);
- DownGlassLogic plcService = plcServiceSupplier.get();
-
-
- //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
- plcService.insertdownglassinfo();
-
-
- //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑閭ｆ潯璁板綍鍒犳帀 宸ヤ綅琛ㄦ祦绋嬪崱缁戝畾浜嗘灦瀛�
- plcService.downWorkstation();
+ Thread.sleep(1000);
+ JSONObject jsonObject = new JSONObject();
+ System.out.println(77);
+ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
+ List<Map<String, Object>> yy= downWorkstationService.getTotalGlassDimensionsByWorkstation();
+ jsonObject.append("data", yy);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ webserver.sendMessage(jsonObject.toString());
+ log.info("鍑嗗鍚� WebSocket 鏈嶅姟鍣ㄥ彂閫佹秷鎭�: {}", jsonObject.toString());
+ }
+ }
} catch (InterruptedException e) {
@@ -44,16 +53,7 @@
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