From 17b583422095aff6bb91bd8ddff5faeb41c8edb2 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 02 十二月 2023 09:06:24 +0800
Subject: [PATCH] 更新电气管理通讯逻辑
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 54 +++++++++++++++++++++++++++++-------------------------
1 files changed, 29 insertions(+), 25 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 59124ce..fd033a7 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,17 +69,7 @@
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");
+
addressList1.add("DB103.44");//D01
addressList1.add("DB103.58");//D02
addressList1.add("DB103.72");//D03
@@ -87,13 +77,14 @@
addressList1.add("DB103.100");//D05
addressList1.add("DB103.114");//D06
addressList1.add("DB103.128");//A01
- addressList1.add("DB103.156");//A01 2
- addressList1.add("DB103.142");//A02
- addressList1.add("DB103.212");//B01
- addressList1.add("DB103.184");//B02
+ addressList1.add("DB103.142");//A01 2
+ addressList1.add("DB103.156");//A02
+ addressList1.add("DB103.184");//B01
+ addressList1.add("DB103.212");//B02
List<String> paramlist = S7control.getinstance().readStrings(addressList1);
+
List<String> addresses = new ArrayList<>();
@@ -113,7 +104,8 @@
List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
List<String> addressList3 = new ArrayList<>();
- addressList3.add("DB106.64");
+ addressList3.add("DB103.256");
+ addressList3.add("DB103.270");
List<String> data3 = S7control.getinstance().readStrings(addressList3);
List<String> addresses4 = new ArrayList<>();
@@ -125,25 +117,26 @@
List<Short> data4 = S7control.getinstance().readWords(addresses4);
-// Boolean[] values = { false, true, true, true, true, true, true, true, true,
-// true};
-// List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
+// String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
+// List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
// Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
// List<Short> data = new ArrayList<>(Arrays.asList(values1));
-// Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-// List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
-// Short[] values3 = { 11};
+// Boolean[] value4 = { false, true, true, true, true, true, true, true, true,
+// true};
+// List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
+// Short[] values3 = { 22,33};
// List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
// Short[] values4 = { 2,2,3,4};
// List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
-
-
+//
+//
JSONObject jsonObject = new JSONObject();
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", paramlist);
jsonObject.append("params", data);
@@ -160,8 +153,19 @@
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
+ List<String> addressList = new ArrayList<>();
- String addressList = "DB101.9.2";
+ addressList.add("DB101.9.2");
+ addressList.add("DB101.9.3");
+ addressList.add("DB101.9.4");
+ addressList.add("DB101.9.5");
+ addressList.add("DB101.9.6");
+ addressList.add("DB101.9.7");
+ addressList.add("DB101.10.0");
+ addressList.add("DB101.10.1");
+ addressList.add("DB101.10.2");
+ addressList.add("DB101.10.3");
+
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
--
Gitblit v1.8.0