From 6bf8a537012962b8eb7daef698da1cc46b8310f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 九月 2023 09:52:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plcstate.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 b3556f7..478a339 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
@@ -16,16 +16,19 @@
}
List<Short> plclist = S7control.getinstance().ReadWord("DB103.DBW0", 10);
+ if (plclist == null) {
- JSONObject jsonObject = new JSONObject();
- // jsonObject.append("sta",
- // new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, });
- jsonObject.append("sta", plclist);
- WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
- if (sendwServer != null) {
- sendwServer.sendMessage(jsonObject.toString());
+ } else {
+ JSONObject jsonObject = new JSONObject();
+ // jsonObject.append("sta",
+ // new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, });
+ jsonObject.append("sta", plclist);
+ WebSocketServer sendwServer = WebSocketServer.sessionMap.get("State");
+ if (sendwServer != null) {
+ sendwServer.sendMessage(jsonObject.toString());
+ }
+
}
-
}
}
}
--
Gitblit v1.8.0