From b6eb0edc58567aca4d303f4928389bf25fe025ba Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 29 十一月 2023 11:04:27 +0800
Subject: [PATCH] 电气后端逻辑修改
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 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 5c4348d..feefee3 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
@@ -69,18 +69,29 @@
List<String> addressList1 = new ArrayList<>();
- addressList1.add("DB103.32~45");
- addressList1.add("DB103.46~59");
- addressList1.add("DB103.60~73");
- addressList1.add("DB103.74~101");
- addressList1.add("DB103.102~115");
- addressList1.add("DB103.116~143");
- addressList1.add("DB103.144~157");
- addressList1.add("DB103.158~171");
- addressList1.add("DB103.172~185");
- addressList1.add("DB103.200~213");
- addressList1.add("DB103.228~241");
- List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);
+// addressList1.add("DB103.32~45");
+// addressList1.add("DB103.46~59");
+// addressList1.add("DB103.60~73");
+// addressList1.add("DB103.74~101");
+// addressList1.add("DB103.102~115");
+// addressList1.add("DB103.116~143");
+// addressList1.add("DB103.144~157");
+// addressList1.add("DB103.158~171");
+// addressList1.add("DB103.172~185");
+// addressList1.add("DB103.200~213");
+// addressList1.add("DB103.228~241");
+ addressList1.add("DB103.40");
+ addressList1.add("DB103.58");
+ addressList1.add("DB103.72");
+ addressList1.add("DB103.86");
+ addressList1.add("DB103.100");
+ addressList1.add("DB103.114");
+ addressList1.add("DB103.128");
+ addressList1.add("DB103.142");
+ addressList1.add("DB103.156");
+ addressList1.add("DB103.184");
+ addressList1.add("DB103.212");
+ List<String> paramlist = S7control.getinstance().readStrings(addressList1);
List<String> addresses = new ArrayList<>();
@@ -100,14 +111,14 @@
List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
List<String> addressList3 = new ArrayList<>();
- addressList3.add("DB106.64-DB106.77");
- List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+ addressList3.add("DB106.64");
+ List<String> data3 = S7control.getinstance().readStrings(addressList3);
List<String> addresses4 = new ArrayList<>();
- addresses.add("DB106.0");
- addresses.add("DB106.12");
- addresses.add("DB106.40");
- addresses.add("DB106.50");
+ addresses4.add("DB103.52");
+ addresses4.add("DB103.54");
+ addresses4.add("DB103.56");
+ addresses4.add("DB103.60");
List<Short> data4 = S7control.getinstance().readWords(addresses4);
@@ -126,14 +137,13 @@
JSONObject jsonObject = new JSONObject();
- short[] params = new short[paramlist.size()];
- for (int i = 0; i < paramlist.size(); i++) {
- boolean value = paramlist.get(i);
+ short[] params = new short[data2.size()];
+ for (int i = 0; i < data2.size(); i++) {
+ boolean value = data2.get(i);
params[i] = value ? (short) 1 : (short) 0;
}
-
jsonObject.append("params", params);
- jsonObject.append("params", data2);
+ jsonObject.append("params", paramlist);
jsonObject.append("params", data);
jsonObject.append("params", data3);
jsonObject.append("params", data4);
--
Gitblit v1.8.0