From 627d77af3fcc77d012160c916349adc2340a846f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 06 五月 2024 08:21:26 +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 | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 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 4b2c56f..82a5217 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
@@ -24,31 +24,25 @@
// 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
MessageHandler customS7Control = new MessageHandler();
-
public PlcPositioning1() throws IOException {
config = new Configuration("config.properties");
}
+
@Override
public void run() {
while (this != null) {
try {
Thread.sleep(1000);
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
-
- // System.out.println(stt);
- //瀛樼墖鏍� 鍑虹墖鏍艰鍙�
+ // System.out.println(stt);
+ // 瀛樼墖鏍� 鍑虹墖鏍艰鍙�
String address = config.getProperty("PlcPositioning1.address");
- List<Short> arraylist = S7control.getinstance().ReadWord(address, 33);
-// System.out.println(arraylist);
+ List<Short> arraylist = S7control.getinstance().ReadWord(address, 33);
+ // System.out.println(arraylist);
-
-// 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,11, 12,13,14,15,16,17,18,19,20 };
-// List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+ // 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,11, 12,13,14,15,16,17,18,19,20 };
+ // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
@@ -58,17 +52,16 @@
arraylist5.addAll(arraylist8);
JSONObject jsonObject = new JSONObject();
-
jsonObject.append("params", arraylist);
jsonObject.append("shishi1", arraylist5);
+ // WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
+ // if (sendwServer != null) {
+ // sendwServer.sendMessage(jsonObject.toString());
+ // }
-// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
-// if (sendwServer != null) {
-// sendwServer.sendMessage(jsonObject.toString());
-// }
-
-// WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Positioning1");
+ // WebSocketServer webSocketServer =
+ // WebSocketServer.sessionMap.get("Positioning1");
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Positioning1");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -76,13 +69,12 @@
if (webserver != null) {
List<String> messages = webserver.getMessages();
- //瀛樼墖鏍� 鍑虹墖鏍煎湴鍧�
-
+ // 瀛樼墖鏍� 鍑虹墖鏍煎湴鍧�
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
String lastMessage = messages.get(messages.size() - 1);
-// System.out.println("lastMessage锛�" + lastMessage);
+ // System.out.println("lastMessage锛�" + lastMessage);
JSONArray messageArray = new JSONArray(lastMessage);
// 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
@@ -104,11 +96,11 @@
}
}
-
- // 鍐欏叆瀛樼墖鏍� 鍑虹墖鏍间綅缃瀹氭暟鎹�
+ // 鍐欏叆瀛樼墖鏍� 鍑虹墖鏍间綅缃瀹氭暟鎹�
if (!mergedList.isEmpty()) {
S7control.getinstance().WriteWord(address, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + address);
+ System.out.println(
+ "messageValue锛�" + mergedList + " written to PLC at address " + address);
}
// 娓呯┖娑堟伅鍒楄〃
@@ -117,8 +109,12 @@
}
}
-
}
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+
}
}
}
--
Gitblit v1.8.0