From e47aa1b3ca12923e194d6e88187d2ecdb29eb186 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 05 十二月 2023 16:09:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java | 72 ++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
index 8b80c45..4af6e13 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcPositioning1.java
@@ -69,7 +69,7 @@
public void run() {
while (this != null) {
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
@@ -79,19 +79,24 @@
// 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);
- Short[] values1 = { 1,2, 3, 4, 5, 6, 7, 8, 9, 10 };
- List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
- Short[] values2 = { 11, 12,13,14,15,16,17,18,19,20 };
- List<Short> state = new ArrayList<>(Arrays.asList(values2));
+ //瀛樼墖鏍� 鍑虹墖鏍艰鍙�
+ List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 23);
+// System.out.println(arraylist);
+// Short[] 瀛樼墖 = { 1 };
+// List<Short> 瀛樼墖1 = new ArrayList<>(Arrays.asList(瀛樼墖));
+// Short[] 鎺ョ墖 = { 1 };
+// List<Short> 鎺ョ墖1 = new ArrayList<>(Arrays.asList(鎺ョ墖));
+// Short[] 闂磋窛 = { 1 };
+// List<Short> 闂磋窛1 = new ArrayList<>(Arrays.asList(闂磋窛));
+// Short[] values1 = {1,1,1, 1,2, 3, 4, 5, 6, 7, 8, 9, 10,11, 12,13,14,15,16,17,18,19,20 };
+// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+
JSONObject jsonObject = new JSONObject();
- // 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", arraylist);
- jsonObject.append("params", state);
+
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
if (sendwServer != null) {
@@ -101,35 +106,46 @@
WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
if (webSocketServer != null) {
List<String> messages = webSocketServer.getMessages();
-
- String addressList = "DB100.0";
+ //瀛樼墖鏍� 鍑虹墖鏍煎湴鍧�
+ String addressList3 = "DB100.42";
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
- System.out.println("messages锛�" + messages);
- String[] parts = lastMessage.split(",");
- List<Short> messageValues = new ArrayList<>();
- for (String part : parts) {
- try {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
- String cleanedPart = part.replaceAll("[^0-9-]", "");
- short value = Short.parseShort(cleanedPart.trim());
- messageValues.add(value);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+// System.out.println("lastMessage锛�" + lastMessage);
+ JSONArray messageArray = new JSONArray(lastMessage);
- e.printStackTrace();
+ // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+ List<Short> mergedList = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ JSONArray sublist = messageArray.getJSONArray(i);
+ for (int j = 0; j < sublist.size(); j++) {
+ Object value = sublist.get(j);
+ if (value != null && !value.toString().equals("null")) {
+ try {
+ String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ short sValue = Short.parseShort(cleanedValue.trim());
+ mergedList.add(sValue);
+ } catch (NumberFormatException e) {
+ // 濡傛灉鏃犳硶瑙ｆ瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ System.err.println("Could not parse value: " + value);
+ }
+ }
}
}
- // 灏嗘秷鎭�煎啓鍏� PLC
-// S7control.getinstance().WriteWord(addressList, messageValues);
- System.out.println("messageValues锛�" + messageValues);
- System.out.println("addressList锛�" + addressList);
+
+ // 鍐欏叆瀛樼墖鏍� 鍑虹墖鏍间綅缃瀹氭暟鎹�
+ if (!mergedList.isEmpty()) {
+ S7control.getinstance().WriteWord(addressList3, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+ }
+
// 娓呯┖娑堟伅鍒楄〃
webSocketServer.clearMessages();
}
+
+
}
}
}
--
Gitblit v1.8.0