From a5ba96bea69ffca37f985c9503c654bf79cf9ef8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 16:57:37 +0800
Subject: [PATCH] 完善主界面，添加笼子表分页与根据玻璃id查询
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java | 100 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 22 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 466e88b..59124ce 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
@@ -66,34 +66,90 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-// this.readValue();
-// String PlcAddress = this.name;
-// Integer Plccount = this.count;
- // System.out.println(stt);
- // List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
- // List<Short> state = S7control.getinstance().ReadWord("DB103.0", 10);
- Boolean[] values = { false, true, true, true, true, true, true, true, true,
- true};
- List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
- Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ 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
+ addressList1.add("DB103.86");//D04
+ 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
- Short[] values2 = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+
+ List<String> paramlist = S7control.getinstance().readStrings(addressList1);
+
+
+ List<String> addresses = new ArrayList<>();
+ addresses.add("DB103.0");
+ addresses.add("DB103.2");
+ addresses.add("DB103.12");
+ addresses.add("DB103.14");
+ addresses.add("DB103.16");
+ addresses.add("DB103.18");
+ addresses.add("DB103.8");
+ addresses.add("DB103.10");
+ addresses.add("DB103.4");
+ addresses.add("DB103.6");
+ List<Short> data = S7control.getinstance().readWords(addresses);
+
+
+
+ List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
+ List<String> addressList3 = new ArrayList<>();
+ addressList3.add("DB106.64");
+ List<String> data3 = S7control.getinstance().readStrings(addressList3);
+
+ List<String> addresses4 = new ArrayList<>();
+ 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));
+// 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));
+// 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;
}
- // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
- // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}
jsonObject.append("params", params);
- jsonObject.append("params", arraylist);
- jsonObject.append("params", state);
+ jsonObject.append("params", paramlist);
+ jsonObject.append("params", data);
+ jsonObject.append("params", data3);
+ jsonObject.append("params", data4);
+
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
@@ -105,7 +161,7 @@
List<String> messages = webSocketServer.getMessages();
- String addressList = "DB2.0.0";
+ String addressList = "DB101.9.2";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
@@ -132,7 +188,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