From 4601fbc2c8f20497010a7d938a8a051efb88f004 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 19 三月 2024 08:37:39 +0800
Subject: [PATCH] 删除mq示例

---
 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java |  405 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 203 insertions(+), 202 deletions(-)

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 2977c20..a1e7574 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
@@ -7,15 +7,20 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.example.springboot.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.Out_slice;
 import com.example.springboot.entity.Queue;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.device.PlcParameterObject;
 import com.example.springboot.mapper.HomeMapper;
 import com.example.springboot.mapper.SpianMapper;
 
@@ -31,95 +36,164 @@
     // 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
     public static Boolean isAllowQueue = true;
     public static Boolean isAllowReordering = true;
+    // 鍑虹墖闃熷垪璀﹀憡
+    public static Boolean isQueueWarning = false;
     // 閾濇id
     public static String FrameNo = "";
     // 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
     public static Boolean isConfirm = false;
+    // 寰呯‘璁ょ殑鍑虹墖闃熷垪
+    public static List<north_glass_buffer1> AluminumFrame;
 
-    private Configuration config;
+    // private Configuration config;
 
     private StorageCageService storageCageService;
 
-    public Plchome() throws IOException {
-        config = new Configuration("config.properties");
-    }
+    public static Boolean FeedState = false;
+
+    // public Plchome() throws IOException {
+    // config = new Configuration("config.properties");
+    // }
 
     // public static Map b=new HashMap<>();
     // b.put()
     @Override
     public void run() {
         while (this != null) {
+            JSONObject jsonObject = new JSONObject();
             try {
                 Thread.sleep(1000);
+                // 娉ㄥ叆mapper                
+                homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
+                spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+                spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+                outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
+                north_Glass_Buffer1Service = WebSocketServer.applicationContext
+                        .getBean(North_Glass_Buffer1Service.class);
+                storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
+                dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
 
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            JSONObject jsonObject = new JSONObject();
+                // 绗煎瓙浣跨敤鎯呭喌
+                List<StorageCage> tableData = homeMapper.selectAll();
+                jsonObject.append("tableData", tableData);
+                // 鏍肩悊鐗囩鏍煎瓙鐘舵��
+                List<StorageCage> cagelist1 = homeMapper.selectRack1();
+                List<StorageCage> cagelist2 = homeMapper.selectRack2();
+                List<StorageCage> cagelist3 = homeMapper.selectRack3();
+                List<StorageCage> cagelist4 = homeMapper.selectRack4();
+                jsonObject.append("cagelist1", cagelist1);
+                jsonObject.append("cagelist2", cagelist2);
+                jsonObject.append("cagelist3", cagelist3);
+                jsonObject.append("cagelist4", cagelist4);
+                // 杩涘嚭鐗囦换鍔�
+                List<StorageCage> tasklist1 = homeMapper.selectinout(3);
+                List<StorageCage> tasklist2 = homeMapper.selectinout(2);
+                jsonObject.append("tasklist1", tasklist1);
+                jsonObject.append("tasklist2", tasklist2);
+                // 鏌ヨ鎶ヨ淇℃伅
+                List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+                jsonObject.append("alarmmg", alarmmg);
 
-            // 娉ㄥ叆mapper
+                // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
+                String queid = spianMapper.Selectqueueid();
+                int state = spianMapper.Selectqueuestate();
+                jsonObject.append("queid", queid);
+                jsonObject.append("state", state);
+                // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
+                Queue form2 = homeMapper.GetQueueInfo(2);
+                Queue form3 = homeMapper.GetQueueInfo(1);
+                if (form2.getglassId() != null && form2.getglassId() != "") {
+                    jsonObject.append("form2", form2);
+                }
+                if (form3.getglassId() != null && form3.getglassId() != "") {
+                    jsonObject.append("form3", form3);
+                }
+                // 鑾峰彇鍑虹墖闃熷垪淇℃伅
+                List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
+                jsonObject.append("listoutslice", listoutslice);
+                // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
+                jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
+                // 鑾峰彇鍑虹墖闃熷垪璀﹀憡鐘舵��
+                jsonObject.append("isQueueWarning", Plchome.isQueueWarning);
+                // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
+                jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
+                // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+                jsonObject.append("isConfirm", isConfirm);
+                // 鏌ヨ褰撳墠閾濇淇℃伅
+                Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+                jsonObject.append("CurrentFrame", CurrentFrame);
 
-            homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
-            spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
-            spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
-            outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
-            north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
-            // 绗煎瓙浣跨敤鎯呭喌
-            List<StorageCage> tableData = homeMapper.selectAll();
-            jsonObject.append("tableData", tableData);
-            // 鏍肩悊鐗囩鏍煎瓙鐘舵��
-            List<StorageCage> cagelist1 = homeMapper.selectRack1();
-            List<StorageCage> cagelist2 = homeMapper.selectRack2();
-            List<StorageCage> cagelist3 = homeMapper.selectRack3();
-            List<StorageCage> cagelist4 = homeMapper.selectRack4();
-            jsonObject.append("cagelist1", cagelist1);
-            jsonObject.append("cagelist2", cagelist2);
-            jsonObject.append("cagelist3", cagelist3);
-            jsonObject.append("cagelist4", cagelist4);
-            // 杩涘嚭鐗囦换鍔�
-            List<StorageCage> tasklist1 = homeMapper.selectinout(3);
-            List<StorageCage> tasklist2 = homeMapper.selectinout(2);
-            jsonObject.append("tasklist1", tasklist1);
-            jsonObject.append("tasklist2", tasklist2);
-            // 鏌ヨ鎶ヨ淇℃伅
-            List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
-            jsonObject.append("alarmmg", alarmmg);
+                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
+                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
 
-            // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
-            String queid = spianMapper.Selectqueueid();
-            int state = spianMapper.Selectqueuestate();
-            jsonObject.append("queid", queid);
-            jsonObject.append("state", state);
-            // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
-            Queue form2 = homeMapper.GetQueueInfo(2);
-            Queue form3 = homeMapper.GetQueueInfo(1);
-            if (form2.getglassId() != null && form2.getglassId() != "") {
-                jsonObject.append("form2", form2);
-            }
-            if (form3.getglassId() != null && form3.getglassId() != "") {
-                jsonObject.append("form3", form3);
-            }
-            // 鑾峰彇鍑虹墖闃熷垪淇℃伅
-            List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
-            jsonObject.append("listoutslice", listoutslice);
-            // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
-            jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
-            // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
-            jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
-            // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
-            jsonObject.append("isConfirm", isConfirm);
-            String framenos="X21763329601FB";
-                if (!framenos.equals(Plchome.FrameNo)) {
-                    Plchome.FrameNo = framenos;
-                    try {
-                        north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
-                    } catch (SQLException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
+                // if (S7control.getinstance().CheckConnected() == true) {
+
+                
+
+                // 閾濇绾夸氦浜�
+                if (S7controlLK.getinstance().CheckConnected() == true) {
+                    if (CurrentFrame != null) {
+                        S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
+                    }
+                    String E01id = S7controlLK.getinstance().readStrings("DB17.0");
+                    String J01id = S7controlLK.getinstance().readStrings("DB17.22");
+
+                    List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
+                    List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
+                    Short framerequest = liststate.get(0);
+                    if (framerequest == 1) {
+                        // 閾濇id
+                        String position;
+                        try {
+                            position = dbserve.SelectPositionByFrameBarcode(J01id);
+                        } catch (SQLException e) {
+                            // TODO Auto-generated catch block
+                            position = "0";
+                            e.printStackTrace();
+                        }
+                        Short send;
+                        if (position.equals("0")) {
+                            send = 0;
+                        } else {
+                            send = 1;
+                        }
+                        S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
                     }
                 }
-            if (S7control.getinstance().CheckConnected() == true) {
-                // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+
+                // 鑾峰彇褰撳墠鎵爜鏂瑰紡
+                List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
+                if (Scanningmethods != null) {
+                    for (Boolean Scanningmethod : Scanningmethods) {
+                        jsonObject.append("Scanningmethod", Scanningmethod);
+                    }
+                }
+                // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
+                String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
+                jsonObject.append("CurrrentGlassId", CurrrentGlassId);
+
+                // 鑾峰彇D01-D06,A01,A02,B01,B02鐘舵��
+                List<Short> DeviceList = S7control.getinstance().ReadWord("DB103.0", 10);
+                jsonObject.append("DeviceList", DeviceList);
+                // 鑾峰彇D01-D06,A01,A02,B01,B02鐜荤拑id
+                List<String> GlassIdList = new ArrayList<String>();
+                GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
+
+                GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.212", 14).toString());
+
+                GlassIdList.add(spianService.queGlassid("DB103.128", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.142", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.156", 14).toString());
+
+                GlassIdList.add(spianService.queGlassid("DB103.72", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.86", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.100", 14).toString());
+                GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
+                jsonObject.append("GlassIdList", GlassIdList);
+
+                // 鑾峰彇Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃�
                 List<String> addressList = new ArrayList<String>();
                 addressList.add("DB106.12");
                 addressList.add("DB106.0");
@@ -127,42 +201,49 @@
                 if (paramlist != null) {
                     jsonObject.append("params", paramlist);
                 }
-                // 鑾峰彇杩涚墖杞︾姸鎬�
-                List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
-                        1);// 鑾峰彇杩涚墖杞︾姸鎬�
-                if (datas1ListState != null) {
-                    boolean exist1 = datas1ListState.contains((short) 0);
-                    jsonObject.append("zhuangtai", exist1);
-                }
+                // // 鑾峰彇杩涚墖杞︾姸鎬�
+                // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+                //         1);// 鑾峰彇杩涚墖杞︾姸鎬�
+                // if (datas1ListState != null) {
+                //     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锛屾坊鍔犲埌鍑虹墖闃熷垪
+                // // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+                // 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="X21763329601FB";
                 String frameno = spianService.queGlassid("DB103.270", 14).toString();
-                // String frameno="X12345611002GV";
-                frameno="X21763329601FB";
                 if (!frameno.equals(Plchome.FrameNo)) {
                     Plchome.FrameNo = frameno;
                     try {
-                        north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+                        Short num = 0;
+                        List<north_glass_buffer1> north_glass_buffer1s = north_Glass_Buffer1Service
+                                .SelectAluminumFrameInfoById(Plchome.FrameNo);
+                        for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
+                            if (north_glass_buffer1.getstorageCage() == null) {
+                                break;
+                            }
+                            num++;
+                        }
+                        if (num == north_glass_buffer1s.size()) {
+                            north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+                        } else {
+                            Plchome.AluminumFrame = north_glass_buffer1s;
+                        }
                     } 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);
+                if (AluminumFrame != null) {
+                    jsonObject.append("AluminumFrame", AluminumFrame);
+                }
 
                 // 澶嶄綅鍊掕鏃�
                 // 鍦板潃104.9.6
@@ -171,7 +252,7 @@
                     jsonObject.append("countdown", countdowns);
                 }
                 // jsonObject.append("countdown", true);
-                // 澶嶄綅瀹屾垚淇″彿ss
+                // 澶嶄綅瀹屾垚淇″彿
                 List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
                 for (Boolean reset : resetss) {
                     jsonObject.append("reset", reset);
@@ -182,61 +263,38 @@
                 for (Boolean emergencystop : emergencystops) {
                     jsonObject.append("emergencystop", emergencystop);
                 }
+                // 鑾峰彇杩涚墖璇锋眰鐘舵��
+                List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+                boolean D01RequestState = D01Request.contains((short) 1);
+                jsonObject.append("D01RequestState", D01RequestState);
 
-                // 缁堟缁х画鎸夐挳
-                List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
-                List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-                // Boolean[] value4 = { false, false};
-                // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
-                Boolean[] value5 = { true };
-                List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
-                short[] anniuparams = new short[anniuread.size()];
-                for (int i = 0; i < anniuread.size(); i++) {
-                    boolean value = anniuread.get(i);
-                    anniuparams[i] = value ? (short) 1 : (short) 0;
-                }
-
-                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;
-                }
-
-                for (short number : resets2) {
-
-                    if (number == 1) {
-                        jsonObject.append("Abort", anniuparams);
-
+                // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
+                List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
+                boolean D01ResponseState = D01respnse.contains((short) 1);
+                // jsonObject.append("D01RequestState", D01RequestState);
+                // 鑷姩杩涚墖
+                isConfirm=true;
+                if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
+                    if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810
+                            || form3.getglasswidth() > 2760)
+                            || (form3.getglassheight() < 390 || form3.getglasswidth() < 380
+                                    || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
+                        FeedState = true;
+                        jsonObject.append("FeedState", FeedState);
+                        FeedState = false;
+                    } else {
+                        if (D01RequestState == true && D01ResponseState != true) {
+                            storageCageService.InsertQueueGlassId((short) 1, form3);
+                        }
                     }
-
                 }
+
+                // }
+
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
 
-            // 閾濇绾夸氦浜�
-
-            // //閾濇id璇锋眰瀛�
-            // List<Short> framerequest = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
-            // if(framerequest!=null){
-            // //閾濇id
-            // String franmeno= spianService.queGlassid("閾濇id鍦板潃", 14).toString();
-            // String position;
-            // try {
-            // position=dbserve.SelectPositionByFrameBarcode(franmeno);
-            // } catch (SQLException e) {
-            // // TODO Auto-generated catch block
-            // position="0";
-            // e.printStackTrace();
-            // }
-            // Short send;
-            // if(position=="0"){
-            // send=0;
-            // }else{
-            // send=1;
-            // }
-            // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short)send);
-            // }
-            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
             boolean dbconnected = false;
             try {
                 dbserve.getConn();
@@ -257,64 +315,7 @@
                         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();
                         }
 

--
Gitblit v1.8.0