From de6afc2ec06724885de7cc0eb8b8cad61f8c0b3b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 07 十二月 2023 08:32:41 +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 | 17 +++++++++--------
1 files changed, 9 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 61c28f0..112ca78 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
@@ -65,20 +65,21 @@
e.printStackTrace();
}
- this.readValue();
- String PlcAddress = this.name;
- Integer Plccount = this.count;
+// this.readValue();
+// String PlcAddress = this.name;
+// Integer Plccount = this.count;
// System.out.println(PlcAddress);
- // 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));
+ //璇诲彇鐘舵�佹暟鎹�
+List<Short> plclist = S7control.getinstance().ReadWord("DB103.0", 44);
+// Short[] values = { 0, 1, 1, 0, 1, 0, 1, 0,
+// 1, 0, };
+// List<Short> plclist = new ArrayList<>(Arrays.asList(values));
if (plclist != null) {
List<String> Intlist = new ArrayList<>();
for (Short value : plclist) {
- Intlist.add(value == 1 ? "鑷姩" : "鎵嬪姩");
+ Intlist.add(value == 1 ? "AUTO" : "Manual");
}
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.8.0