From 627d77af3fcc77d012160c916349adc2340a846f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 08:21:26 +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, 31 insertions(+), 31 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 cf362da..b5aafb4 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
@@ -61,41 +61,41 @@
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) {
+ webserver.sendMessage(jsonObject.toString());
+ }
+ }
+
+ }
} 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 ? "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) {
- webserver.sendMessage(jsonObject.toString());
- }
- }
-
- }
}
}
}
--
Gitblit v1.8.0