From e7eaa7bb402aae3bb88d9219e50f0e1179f3257f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 26 十二月 2023 09:28:52 +0800
Subject: [PATCH] layout 布局页增加A01 A02终止继续后选择 弹框

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java                |   16 +-
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java                 |    2 
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java |   58 ++++----
 springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java                     |    2 
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java                      |  215 +++++++++++++++++++++++++----------
 CanadaMes-ui/src/layout/index.vue                                                                |   33 ++++-
 6 files changed, 217 insertions(+), 109 deletions(-)

diff --git a/CanadaMes-ui/src/layout/index.vue b/CanadaMes-ui/src/layout/index.vue
index 6566166..7a0c9e5 100644
--- a/CanadaMes-ui/src/layout/index.vue
+++ b/CanadaMes-ui/src/layout/index.vue
@@ -117,6 +117,7 @@
 import { changePassword } from '../api/user'
 import { removeToken } from "../utils/auth";
 import LanguageMixin from '../lang/LanguageMixin'
+import { MessageBox } from 'element-ui';
 // import { mapState, mapMutations } from 'vuex';
 // import Tag from '../layout/tag.vue';
 // import store from '../store';
@@ -146,7 +147,7 @@
         pageNum: -1
       },
       dialogFormVisible2: false,
-      dialogFormVisible3: true,
+      dialogFormVisible3: false,
       alarm: [],
       alarm2: []
     }
@@ -175,6 +176,13 @@
   },
   methods: {
     toggleButtonValue(buttonNumber) {
+
+      MessageBox.confirm(this.$t('Are you sure to perform this operation?'), this.$t('prompt'), {
+    confirmButtonText: this.$t('confirm'),
+    cancelButtonText: this.$t('cancel'),
+    type: 'warning'
+  }).then(() => {
+    // 鐐瑰嚮纭鎸夐挳鍚庢墽琛岀殑鎿嶄綔
       if (buttonNumber === 1) {
         this.receivedData = this.receivedData === 0 ? 1 : 0;
       } else if (buttonNumber === 2) {
@@ -198,9 +206,13 @@
         const jsonString3 = JSON.stringify(jsonObject3);
         console.log("鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨:", jsonString3);
         socket?.send(jsonString3);
-        // setTimeout(()=>
-        //   window.location.reload(),2000
-        // )
+        setTimeout(() => {
+      this.dialogFormVisible3 = false;
+    }, 1000); // 寤惰繜鏃堕棿涓�1绉掞紙1000姣锛�
+      }).catch(() => {
+    // 鐐瑰嚮鍙栨秷鎸夐挳鍚庢墽琛岀殑鎿嶄綔
+  });
+     
       
 
 
@@ -226,7 +238,9 @@
         socket.onmessage = function (msg) {
           //console.log("鏀跺埌鏁版嵁====" + msg.data);
           let obj = JSON.parse(msg.data);
-          
+          if(obj.alarmmg){
+
+         
           if (obj.alarmmg[0].length > 0) {
             if (this.alarm.length > 0) {
               if (this.alarm[this.alarm.length - 1].id != obj.alarmmg[0][obj.alarmmg[0].length-1].id) {
@@ -238,7 +252,7 @@
               this.dialogFormVisible2 = true;
             }
           }
-
+        }
 
 
 
@@ -246,14 +260,17 @@
           
           this.$forceUpdate();
 
+if(obj.Abort){
+
+
 
 
           if (obj.Abort[0].length > 0) {
             this.receivedData=obj.Abort[0][0];
             this.receivedData2=obj.Abort[0][1];
-            this.dialogFormVisible3 = true;
+           this.dialogFormVisible3 = true;
           }
-        
+        }
 
         }.bind(this);
         //鍏抽棴浜嬩欢
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 3532c83..76ba5f6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -34,36 +34,36 @@
 
       // System.out.println(stt);
 
-      List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
-      List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
-      List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
-      List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
-
-      List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
-
-      List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
-      //System.out.println("lastMessage锛�" + arraylist2);
-
-//缈昏浆
-      List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
-      List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
-
-
-//       Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
-//       List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-//       Short[] fanzhuan = { 4 };
-//       List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
-//       Short[] dache = { 5 };
-//       List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
-//       Short[] xiaoche = { 6 };
-//       List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+//      List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
+//      List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
+//      List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
+//      List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
 //
-//       Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-//       List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-//       Short[] fanzhuan22 = { 4 };
-//       List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
-//       Short[] xiaoche22 = {5};
-//       List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
+//      List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+//
+//      List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+//      //System.out.println("lastMessage锛�" + arraylist2);
+//
+////缈昏浆
+//      List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
+//      List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+
+
+       Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+       List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+       Short[] fanzhuan = { 4 };
+       List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+       Short[] dache = { 5 };
+       List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+       Short[] xiaoche = { 6 };
+       List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+
+       Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+       List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+       Short[] fanzhuan22 = { 4 };
+       List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
+       Short[] xiaoche22 = {5};
+       List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
 
       JSONObject jsonObject = new JSONObject();
       // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
index 1598c96..92ed72d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java
@@ -21,7 +21,7 @@
 
 public class PlcParameter2 extends Thread {
     @Autowired
-    StorageCageService StorageCageService  ;
+    StorageCageService storageCageService;
 
 
     // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
@@ -44,7 +44,7 @@
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            StorageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
+            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService .class);
             //  id
             List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
 
@@ -201,13 +201,13 @@
                                            System.out.println(id);
                                             switch (i) {
                                                 case 1:
-                                                    StorageCageService.UpdateTask(2, 0, paramlist.get(i));
+                                                    storageCageService.UpdateTask(2, 0, paramlist.get(i));
                                                     break;
                                                 case 2:
                                                 case 3:
                                                 case 4:
                                                 case 5:
-                                                    StorageCageService.UpdateTask(3, 0, paramlist.get(i));
+                                                    storageCageService.UpdateTask(3, 0, paramlist.get(i));
                                                     break;
                                                 default:
                                                     // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
@@ -270,19 +270,19 @@
                                     boolean Value2 = sValue.get(1);
 
                                     if (Value1) {
-                                        StorageCageService.EndTask(0);
+                                        storageCageService.EndTask(0);
 
                                     }
                                     if (Value2) {
-                                        StorageCageService.EndTask(1);
+                                        storageCageService.EndTask(1);
 
                                     }
                                     // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
                                     if (!sValue.isEmpty()) {
 
                                         // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
-                                        S7control.getinstance().WriteBit(addressList0, sValue);
-                                        System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
+                                        S7control.getinstance().WriteBit(niuanaddressList3, sValue);
+                                        System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
                                     }
                                 }
                             } catch (Exception e) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
index fca4eb9..2d0c98d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcalarm.java
@@ -28,7 +28,7 @@
     FileInputStream fileInputStream;
     try {
       // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
-      fileInputStream = new FileInputStream("D:/Code/canadames/Alarm.json");
+      fileInputStream = new FileInputStream("D:/canadames/Alarm.json");
       // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙g爜涓哄瓧绗�
       InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
       // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 32c2368..0cae2f5 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -1,5 +1,6 @@
 package com.example.springboot.component;
 
+import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 
 import java.io.IOException;
@@ -8,6 +9,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.example.springboot.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.example.springboot.entity.Out_slice;
@@ -16,10 +18,7 @@
 import com.example.springboot.entity.alarmmg;
 import com.example.springboot.mapper.HomeMapper;
 import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.service.JdbcConnections;
-import com.example.springboot.service.North_Glass_Buffer1Service;
-import com.example.springboot.service.OutSliceServive;
-import com.example.springboot.service.SpianService;
+import com.example.springboot.service.StorageCageService;
 
 public class Plchome extends Thread {
 
@@ -34,13 +33,15 @@
     public static Boolean isAllowQueue = true;
     public static Boolean isAllowReordering = true;
     // 閾濇id
-    public static String FrameNo="";
+    public static String FrameNo = "";
     // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
     public static Boolean isConfirm = false;
 
     private Configuration config;
 
 
+
+    private  StorageCageService storageCageService;
 
 
     public Plchome() throws IOException {
@@ -61,6 +62,7 @@
             JSONObject jsonObject = new JSONObject();
 
             // 娉ㄥ叆mapper
+
             homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
             spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
             spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
@@ -111,65 +113,65 @@
             // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
             jsonObject.append("isConfirm", isConfirm);
 
-             // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
-             List<String> addressList = new ArrayList<String>();
-             addressList.add("DB106.12");
-             addressList.add("DB106.0");
-             List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
-             if (paramlist != null) {
-                 jsonObject.append("params", paramlist);
-             }
-             // 鑾峰彇杩涚墖杞︾姸鎬�
-             List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
-                     1);// 鑾峰彇杩涚墖杞︾姸鎬�
-             boolean exist1 = datas1ListState.contains((short) 0);
-             jsonObject.append("zhuangtai", exist1);
-             // 鑾峰彇杩涚墖鐜荤拑淇℃伅
-             List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
-             if (inglassInfo != null) {
-                 if (inglassInfo.size() > 0)
-                     jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
-             }
+            // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+            List<String> addressList = new ArrayList<String>();
+            addressList.add("DB106.12");
+            addressList.add("DB106.0");
+            List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+            if (paramlist != null) {
+                jsonObject.append("params", paramlist);
+            }
+            // 鑾峰彇杩涚墖杞︾姸鎬�
+            List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+                    1);// 鑾峰彇杩涚墖杞︾姸鎬�
+            boolean exist1 = datas1ListState.contains((short) 0);
+            jsonObject.append("zhuangtai", exist1);
+            // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+            List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+            if (inglassInfo != null) {
+                if (inglassInfo.size() > 0)
+                    jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+            }
 
-             // 鑾峰彇閾濇idDB106.DBW64
-             String frameno = spianService.queGlassid("DB103.270", 14).toString();
-             // String frameno="X12345611002GV";
-             if (!frameno.equals(Plchome.FrameNo)) {
-                 Plchome.FrameNo = frameno;
-                 try {
-                     north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
-                 } catch (SQLException e) {
-                     // TODO Auto-generated catch block
-                     e.printStackTrace();
-                 }
-             }
+            // 鑾峰彇閾濇idDB106.DBW64
+            String frameno = spianService.queGlassid("DB103.270", 14).toString();
+            // String frameno="X12345611002GV";
+            if (!frameno.equals(Plchome.FrameNo)) {
+                Plchome.FrameNo = frameno;
+                try {
+                    north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+                } catch (SQLException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
 
-             // 鑾峰彇杩涚墖璇锋眰鐘舵��
-             List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
-             boolean D01RequestState = D01Request.contains((short) 1);
-             // boolean D01RequestState =true;
-             jsonObject.append("D01RequestState", D01RequestState);
+            // 鑾峰彇杩涚墖璇锋眰鐘舵��
+            List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+            boolean D01RequestState = D01Request.contains((short) 1);
+            // boolean D01RequestState =true;
+            jsonObject.append("D01RequestState", D01RequestState);
 
-             // 澶嶄綅鍊掕鏃�
-             // 鍦板潃104.9.6
-             List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
-             for (Boolean countdowns : countdown) {
-                 jsonObject.append("countdown", countdowns);
-             }
-             // jsonObject.append("countdown", true);
-             // 澶嶄綅瀹屾垚淇″彿
-             List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
-             for (Boolean reset : resets) {
-                 jsonObject.append("reset", reset);
-             }
+            // 澶嶄綅鍊掕鏃�
+            // 鍦板潃104.9.6
+            List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
+            for (Boolean countdowns : countdown) {
+                jsonObject.append("countdown", countdowns);
+            }
+            // jsonObject.append("countdown", true);
+            // 澶嶄綅瀹屾垚淇″彿
+            List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
+            for (Boolean reset : resets) {
+                jsonObject.append("reset", reset);
+            }
 
-             // 鏄惁鎬ュ仠
-             List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
-             for (Boolean emergencystop : emergencystops) {
-                 jsonObject.append("emergencystop", emergencystop);
-             }
+            // 鏄惁鎬ュ仠
+            List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
+            for (Boolean emergencystop : emergencystops) {
+                jsonObject.append("emergencystop", emergencystop);
+            }
 
-             //缁堟缁х画鎸夐挳
+            //缁堟缁х画鎸夐挳
             List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
             List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
 
@@ -178,7 +180,26 @@
                 boolean value = anniuread.get(i);
                 anniuparams[i] = value ? (short) 1 : (short) 0;
             }
-            jsonObject.append("Abort", anniuparams);
+
+
+            short[] resets2 = new short[resets.size()];
+            for (int i = 0; i < resets.size(); i++) {
+                boolean value = resets.get(i);
+                resets2[i] = value ? (short) 1 : (short) 0;
+            }
+
+//            System.out.println(resets);
+            for (short number : resets2) {
+
+                if (number == 1) {
+                    System.out.println(resets);
+                    jsonObject.append("Abort", anniuparams);
+
+                }
+
+            }
+
+
             // 閾濇绾夸氦浜�
 
             // //閾濇id璇锋眰瀛�
@@ -202,7 +223,7 @@
             // }
             // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
             // }
-
+            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
             dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
             boolean dbconnected = false;
             try {
@@ -218,9 +239,79 @@
             if (sendwServer != null) {
                 for (WebSocketServer webserver : sendwServer) {
                     webserver.sendMessage(jsonObject.toString());
+
+                    if (webserver != null) {
+
+
+                        List<String> messages = webserver.getMessages();
+
+                        if (!messages.isEmpty()) {
+                            // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+                            String lastMessage = messages.get(messages.size() - 1);
+//        System.out.println("lastMessage锛�" + lastMessage);
+                            JSONArray messageArray = new JSONArray(lastMessage);
+
+
+                            try {
+                                // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
+                                if (messageArray.getJSONArray(0).size() > 0) {
+                                    // 鑾峰彇娑堟伅鏁扮粍
+                                    JSONArray jsonArray = messageArray.getJSONArray(0);
+                                    // 鍒涘缓涓�涓竷灏斿�煎垪琛�
+                                    List<Boolean> sValue = new ArrayList<>();
+                                    // 閬嶅巻娑堟伅鏁扮粍
+                                    for (int i = 0; i < jsonArray.size(); i++) {
+                                        // 鑾峰彇娑堟伅鏁扮粍涓殑鍊�
+                                        Object value = jsonArray.get(i);
+                                        // 妫�鏌ュ�兼槸鍚︽湁鏁�
+                                        if (value != null && !value.toString().equals("null")) {
+                                            try {
+                                                // 绉婚櫎闈炴暟瀛楀拰鏁板瓧瀛楃
+                                                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+                                                // 瑙f瀽涓哄竷灏斿��
+                                                boolean val = "1".equals(cleanedValue.trim());
+                                                // 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
+                                                sValue.add(val);
+                                                System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+
+
+                                            } catch (NumberFormatException e) {
+                                                // 濡傛灉鏃犳硶瑙f瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+                                                System.err.println("Could not parse value: " + value);
+                                            }
+                                        }
+                                    }
+// 缁堟杩涚墖浠诲姟
+                                    boolean Value1 = sValue.get(0);
+                                    boolean Value2 = sValue.get(1);
+
+                                    if (Value1) {
+                                        storageCageService.EndTask(0);
+
+                                    }
+                                    if (Value2) {
+                                        storageCageService.EndTask(1);
+
+                                    }
+                                    // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
+                                    if (!sValue.isEmpty()) {
+
+                                        // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
+                                        S7control.getinstance().WriteBit(niuanaddressList3, sValue);
+                                        System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
+                                    }
+                                }
+                            } catch (Exception e) {
+                                System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
+                            }
+                            webserver.clearMessages();
+                        }
+
+
+                    }
+
                 }
             }
-
         }
     }
 }
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index b6441b1..a7a0260 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,7 +17,7 @@
         //
         System.out.println("鍚姩瀹屾垚");
 
- new PlcHold().start();
+ //new PlcHold().start();
 
         new Plchome().start();
 

--
Gitblit v1.8.0