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/Plchome.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 4ba4874..026cace 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -49,26 +49,19 @@
jsonObject.append("alarmmg", alarmmg);
//璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
List<String> addressList = new ArrayList<String>();
- addressList.add("DB100.DBW0");
- addressList.add("DB100.DBW12");
+ addressList.add("DB105.DBW0");
+ addressList.add("DB105.DBW12");
List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
//灏嗛泦鍚堣浆涓烘暟缁�
- Short[] paramlists = paramlist.toArray(new Short[0]);
- jsonObject.append("params", paramlists);
+ if(paramlist!=null){
+ Short[] paramlists = paramlist.toArray(new Short[0]);
+ jsonObject.append("params", paramlists);
+ }
// jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
-
if (sendwServer != null) {
sendwServer.sendMessage(jsonObject.toString());
}
-
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.append("params", new short[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
- // 11, });
- // WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
- // if (sendwServer != null) {
- // sendwServer.sendMessage(jsonObject.toString());
- // }
}
}
--
Gitblit v1.8.0