From 3fdf3c82bc1ac5f5fdce0f841db7bdeacf75704c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 26 一月 2024 13:53:34 +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 | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 67956dd..4b2c56f 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
@@ -18,7 +18,16 @@
public class PlcPositioning1 extends Thread {
+ // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+ private Configuration config;
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+ public PlcPositioning1() throws IOException {
+ config = new Configuration("config.properties");
+ }
@Override
public void run() {
while (this != null) {
@@ -32,18 +41,26 @@
// System.out.println(stt);
//瀛樼墖鏍� 鍑虹墖鏍艰鍙�
- List<Short> arraylist = S7control.getinstance().ReadWord("DB100.42", 33);
+
+ String address = config.getProperty("PlcPositioning1.address");
+ 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));
-
-
+ 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);
+ List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
+ arraylist5.addAll(arraylist6);
+ arraylist5.addAll(arraylist7);
+ arraylist5.addAll(arraylist8);
JSONObject jsonObject = new JSONObject();
jsonObject.append("params", arraylist);
+ jsonObject.append("shishi1", arraylist5);
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
@@ -60,7 +77,7 @@
if (webserver != null) {
List<String> messages = webserver.getMessages();
//瀛樼墖鏍� 鍑虹墖鏍煎湴鍧�
- String addressList3 = "DB100.42";
+
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
@@ -90,8 +107,8 @@
// 鍐欏叆瀛樼墖鏍� 鍑虹墖鏍间綅缃瀹氭暟鎹�
if (!mergedList.isEmpty()) {
- S7control.getinstance().WriteWord(addressList3, mergedList);
- System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList3);
+ S7control.getinstance().WriteWord(address, mergedList);
+ System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + address);
}
// 娓呯┖娑堟伅鍒楄〃
--
Gitblit v1.8.0