From 328d276bec3fa2d3b1fd9fec1965c11b4e45c1c7 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期五, 15 九月 2023 16:59:04 +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 | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 ba8d08b..e02e09a 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
@@ -4,26 +4,31 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Arrays;
public class Plcstate extends Thread {
@Override
public void run() {
while (this != null) {
try {
- Thread.sleep(10000);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}
- List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
- if (plclist == null) {
+ List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 10);
+ // Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+ // 1, 0, };
+ // List<Short> plclist = new ArrayList<>(Arrays.asList(values));
+ if (plclist != null) {
- } else {
+ List<String> Intlist = new ArrayList<>();
+ for (Short value : plclist) {
+ Intlist.add(value == 1 ? "鑷姩" : "鎵嬪姩");
+ }
JSONObject jsonObject = new JSONObject();
- // jsonObject.append("sta",
- // new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, });
- jsonObject.append("sta", plclist);
+ jsonObject.append("sta", Intlist);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0