From 707d28bd18f8832ac3824af4ae6f50dc1a30ee41 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:02:50 +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 | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 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..7d65157 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,22 +66,58 @@
} 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);
+ 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);
- 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> 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);
- Short[] values2 = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+ List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
+ List<String> addressList3 = new ArrayList<>();
+ addressList3.add("DB103.6");
+ List<Boolean> data3 = S7control.getinstance().readBits(addressList3);
+
+ List<String> addresses4 = new ArrayList<>();
+ addresses.add("DB106.0");
+ addresses.add("DB106.12");
+ addresses.add("DB106.40");
+ addresses.add("DB106.50");
+
+ 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()];
@@ -89,11 +125,12 @@
boolean value = paramlist.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", data);
+ jsonObject.append("params", data2);
+ jsonObject.append("params", data3);
+ jsonObject.append("params", data4);
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
if (sendwServer != null) {
@@ -105,7 +142,7 @@
List<String> messages = webSocketServer.getMessages();
- String addressList = "DB2.0.0";
+ String addressList = "DB101.9.2";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
@@ -121,7 +158,7 @@
messageValues.add(value);
} catch (NumberFormatException e) {
// 濡傛灉鏃犳硶瑙ｆ瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
-// e.printStackTrace();
+ // e.printStackTrace();
}
}
@@ -132,7 +169,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