From a78422827afcedefd5a0ca1d893198d48ea8062f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 09:16:56 +0800
Subject: [PATCH] 修改翻译  界面按钮顺序 布局等

---
 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 82a5217..782a638 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
@@ -4,8 +4,8 @@
 import cn.hutool.json.JSONObject;
 
 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;
@@ -28,6 +28,11 @@
         config = new Configuration("config.properties");
     }
 
+
+
+
+
+
     @Override
     public void run() {
         while (this != null) {
@@ -35,6 +40,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);
@@ -54,7 +69,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());
@@ -103,6 +118,8 @@
                                         "messageValue锛�" + mergedList + " written to PLC at address " + address);
                             }
 
+                            customS7Control.writeBitToPLC(messageArray, PLCOriginmarking, 7);
+
                             // 娓呯┖娑堟伅鍒楄〃
                             webserver.clearMessages();
                         }

--
Gitblit v1.8.0