From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
index c62f94f..1059b31 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -13,6 +14,7 @@
import java.util.List;
import java.util.Arrays;
+@Slf4j
public class Plcstate extends Thread {
String name = "";
Integer count = 0;
@@ -61,35 +63,45 @@
while (this != null) {
try {
Thread.sleep(1000);
+ // this.readValue();
+ // String PlcAddress = this.name;
+ // Integer Plccount = this.count;
+ // System.out.println(PlcAddress);
+
+ // 璇诲彇鐘舵�佹暟鎹�
+ List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 44);
+ // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+ // 1, 0, };
+ // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+ if (plclist != null) {
+
+ List<String> Intlist = new ArrayList<>();
+ for (Short value : plclist) {
+ Intlist.add(value == 1 ? "AUTO" : "Manual");
+
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("sta", Intlist);
+ // WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
+ // if (sendwServer != null) {
+ // sendwServer.sendMessage(jsonObject.toString());
+ // }
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("State");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null && webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject.toString());
+ }else{
+ log.info("State杩炴帴宸插叧闂�");
+ }
+ }
+ }
+
+ }
} catch (InterruptedException e) {
e.printStackTrace();
}
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- // System.out.println(PlcAddress);
-
- //璇诲彇鐘舵�佹暟鎹�
-List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 44);
-// Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
-// 1, 0, };
-// List<Short> plclist = new ArrayList<>(Arrays.asList(values));
- if (plclist != null) {
-
- List<String> Intlist = new ArrayList<>();
- for (Short value : plclist) {
- Intlist.add(value == 1 ? "鑷姩" : "鎵嬪姩");
-
- }
- JSONObject jsonObject = new JSONObject();
- jsonObject.append("sta", Intlist);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
- }
-
- }
}
}
}
--
Gitblit v1.8.0