From 3545d55a89255b2c5849018019335d90172fcc04 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 20 十二月 2023 13:26:03 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 89f1811..b5fd0ff 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -56,7 +56,11 @@
//鎬ュ仠鎸夐挳
List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
+ List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
+ String timeout2 = config.getProperty("Parameter2.timeout");
+
+ Long readtimeout = S7control.getinstance().readtime(timeout2);
List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
@@ -108,6 +112,7 @@
jsonObject.append("params", data3);
jsonObject.append("params", data4);
jsonObject.append("jiting", anniuparams);
+ jsonObject.append("timeout", readtimeout);
// WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
@@ -139,6 +144,8 @@
customS7Control.writeBitToPLC(messageArray, addressList0, 0);
//鎬ュ仠
customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
+ customS7Control.Writetime(messageArray, timeout2, 2);
+
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
--
Gitblit v1.8.0