From cb8959244281f922d3a972472853d0bb1df1e5b8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 20 十二月 2023 13:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 34a8ef2..62cf276 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
@@ -42,7 +42,7 @@
while (this != null) {
try {
Thread.sleep(1000);
-
+
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -127,21 +127,26 @@
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
- //鑾峰彇杩涚墖璇锋眰鐘舵��
+ // 鑾峰彇杩涚墖璇锋眰鐘舵��
List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short)1);
+ boolean D01RequestState = D01Request.contains((short) 1);
// boolean D01RequestState =true;
jsonObject.append("D01RequestState", D01RequestState);
- //澶嶄綅鍊掕鏃�
+ // 澶嶄綅鍊掕鏃�
// 鍦板潃104.9.6
List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
for (Boolean countdowns : countdown) {
jsonObject.append("countdown", countdowns);
}
// jsonObject.append("countdown", true);
+ // 澶嶄綅瀹屾垚淇″彿
+ List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
+ for (Boolean reset : resets) {
+ jsonObject.append("reset", reset);
+ }
- //鏄惁鎬ュ仠
+ // 鏄惁鎬ュ仠
List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
for (Boolean emergencystop : emergencystops) {
jsonObject.append("emergencystop", emergencystop);
--
Gitblit v1.8.0