From 4c70d9f0656bbec48fa619f2ec9aa0ee12fca2c1 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 04 十二月 2023 09:04:51 +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 | 100 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 65 insertions(+), 35 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..6f18c01 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,22 @@
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.44");//D01
+ addressList1.add("DB103.58");//D02
+ addressList1.add("DB103.72");//D03
+ addressList1.add("DB103.86");//D04
+ addressList1.add("DB103.100");//D05
+ addressList1.add("DB103.114");//D06
+ addressList1.add("DB103.128");//A01
+ 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<>();
@@ -96,44 +100,58 @@
addresses.add("DB103.6");
List<Short> data = S7control.getinstance().readWords(addresses);
+ List<String> addressList0 = new ArrayList<>();
+
+ addressList0.add("DB101.9.2");
+ addressList0.add("DB101.9.3");
+ addressList0.add("DB101.9.4");
+ addressList0.add("DB101.9.5");
+ addressList0.add("DB101.9.6");
+ addressList0.add("DB101.9.7");
+
+ addressList0.add("DB101.10.0");
+ addressList0.add("DB101.10.1");
+ addressList0.add("DB101.10.2");
+ addressList0.add("DB101.10.3");
- List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
+ List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
List<String> addressList3 = new ArrayList<>();
- addressList3.add("DB106.64-DB106.77");
- List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+ addressList3.add("DB103.256");
+ addressList3.add("DB103.270");
+ 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);
-
-// 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};
-// List<Short> data3 = new ArrayList<>(Arrays.asList(values3));
+// Boolean[] value4 = { true, true, true, true, true, true, true, true, true,
+// true};
+// List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
+// String[] values3 = { ".x11 ","x21 "};
+// List<String> 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[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);
@@ -148,8 +166,20 @@
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()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
@@ -176,7 +206,7 @@
}
// 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
- S7control.getinstance().WriteBit(addressList, messageBooleans);
+ S7control.getinstance().WriteBit(addressList, messageBooleans);
System.out.println("messageValues锛�" + messageBooleans);
System.out.println("addressList锛�" + addressList);
// 娓呯┖娑堟伅鍒楄〃
--
Gitblit v1.8.0