From 63574bf6cf94613385cb8d0e2c2beb1829f644b5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 11:50:35 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 523bc43..2694358 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
@@ -5,8 +5,8 @@
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -31,6 +31,11 @@
config = new Configuration("config.properties");
}
+
+
+
+
+
@Override
public void run() {
while (this != null) {
@@ -38,6 +43,16 @@
Thread.sleep(1000);
// System.out.println(stt);
// 瀛樼墖鏍� 鍑虹墖鏍艰鍙�
+ List<String> PLCOriginmarking = Arrays.asList(config.getProperty("PLCOriginmarking").split(","));
+
+
+ List<Boolean> PLCOriginmarkingarraylist = S7control.getinstance().readBits(PLCOriginmarking);
+
+ short[] params = new short[PLCOriginmarkingarraylist.size()];
+ for (int i = 0; i < PLCOriginmarkingarraylist.size(); i++) {
+ boolean value = PLCOriginmarkingarraylist.get(i);
+ params[i] = value ? (short) 1 : (short) 0;
+ }
String address = config.getProperty("PlcPositioning1.address");
List<Short> arraylist = S7control.getinstance().ReadWord(address, 33);
@@ -57,7 +72,7 @@
jsonObject.append("params", arraylist);
jsonObject.append("shishi1", arraylist5);
-
+ jsonObject.append("PLCOriginmarkingarraylist", params);
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Positioning1");
// if (sendwServer != null) {
// sendwServer.sendMessage(jsonObject.toString());
@@ -107,6 +122,8 @@
"messageValue锛�" + mergedList + " written to PLC at address " + address);
}
+ customS7Control.writeBitToPLC(messageArray, PLCOriginmarking, 7);
+
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
--
Gitblit v1.8.0