From 09fe50d59e2f1e2261d376eb49ad6c40301f25b4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 五月 2024 16:08:59 +0800
Subject: [PATCH] 修改IP与数据库连接

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java |  509 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 248 insertions(+), 261 deletions(-)

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 8054729..61f8c6c 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
@@ -2,6 +2,8 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
 import com.example.springboot.controller.HomeController;
 import com.example.springboot.mapper.HomeMapper;
 import org.apache.commons.io.FileUtils;
@@ -14,22 +16,14 @@
 import java.util.Collections;
 import java.util.List;
 
-
-
-
-
-
+@Slf4j
 public class PlcParameter2 extends Thread {
     @Autowired
-    StorageCageService StorageCageService  ;
-
-
-    // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
-    private Configuration config;
-
+    StorageCageService storageCageService;
     // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
     MessageHandler customS7Control = new MessageHandler();
-
+    // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+    private Configuration config;
 
     public PlcParameter2() throws IOException {
         config = new Configuration("config.properties");
@@ -40,260 +34,253 @@
         while (this != null) {
             try {
                 Thread.sleep(1000);
+                storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
+                // id
+                List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
+                List<String> paramlist = S7control.getinstance().readStrings(addressList1);
+                // System.out.println(paramlist);
+                // 鎵嬪姩鐘舵��
+                List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
+                List<Short> data = S7control.getinstance().readWords(addresses);
+                // 娓呴櫎id
+                List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
+                // 鎵爜鏋�
+                List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
+                List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
 
+                // 鎬ュ仠鎸夐挳
+                List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
+                List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
+                String timeout2 = config.getProperty("Parameter2.timeout");
+
+                Long readtimeout = S7control.getinstance().readtime(timeout2);
+                List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
+                List<String> data3 = S7control.getinstance().readStrings(addressList3);
+                // A01 A02 B01 B02
+                List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
+                List<Short> data4 = S7control.getinstance().readWords(addresses4);
+                // System.out.println(data);
+                // List<Long> TIME2 =
+                // Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
+                // System.out.println("addressList锛�" + TIME2);
+
+                //
+
+                //
+                // String[] values6 = { ".x1 ","x2
+                // ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
+                // List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
+                // Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+                // List<Short> data = new ArrayList<>(Arrays.asList(values1));
+                // Boolean[] value4 = { false, false, false, false, false, false, false, false,
+                // false,
+                // false};
+                // List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
+                // String[] values3 = { ".x11 ","x21 "};
+                // List<String> data3 = new ArrayList<>(Arrays.asList(values3));
+                // Short[] values4 = { 2,2,3,4};
+                // List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
+                //
+                //
+                // JSONObject jsonObject = new JSONObject();
+                // short[] params = new short[data2.size()];
+                // for (int i = 0; i < data2.size(); i++) {
+                // boolean value = data2.get(i);
+                // params[i] = value ? (short) 1 : (short) 0;
+                // }
+                ////
+                // 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;
+                // }
+                // boolean杞负0 1
+                short[] params = customS7Control.convertBooleanListToShortArray(data2);
+                short[] anniuparams = customS7Control.convertBooleanListToShortArray(anniuread);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.append("params", params);
+                jsonObject.append("params", paramlist);
+                jsonObject.append("params", data);
+                jsonObject.append("params", data3);
+                jsonObject.append("params", data4);
+                jsonObject.append("jiting", anniuparams);
+                jsonObject.append("timeout", readtimeout);
+
+                // WebSocketServer sendwServer =
+                // WebSocketServer.getWebSocketServer("Parameter2");
+                // if (sendwServer != null) {
+                // JSONObject jsonObject = new JSONObject();
+                // jsonObject.set("message", "Hello, Parameter2!");
+                // sendwServer.sendMessage(jsonObject.toString());
+                // }
+                // HomeController controller = new HomeController();
+                ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
+                if (sendwServer != null) {
+                    for (WebSocketServer webserver : sendwServer) {
+
+                        
+
+                        if (webserver != null&&webserver.session.isOpen()) {
+                            webserver.sendMessage(jsonObject.toString());
+                            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);
+                                // 娓呴櫎ID
+                                // customS7Control.writeBitToPLC(messageArray, addressList0, 0);
+
+                                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 containsOne = data.stream().anyMatch(number -> number == 1);
+                                        for (int i = 1; i <= 5; i++) {
+                                            boolean value = sValue.get(i);
+                                            String id = paramlist.get(i);
+                                            // 鍒ゆ柇鏄惁鑷姩鐘舵��
+                                            if (!containsOne) {
+                                                // 鍒ゆ柇id鏄惁鍖呭惈鏁板瓧
+                                                if (id.matches(".*\\d.*")) {
+                                                    // 鍒ゆ柇娓呴櫎id鏄惁true
+                                                    if (value) {
+                                                        System.out.println(id);
+                                                        switch (i) {
+                                                            case 1:
+                                                                storageCageService.UpdateTask(2, 0, paramlist.get(i));
+                                                                break;
+                                                            case 2:
+                                                            case 3:
+                                                            case 4:
+                                                            case 5:
+                                                                storageCageService.UpdateTask(3, 0, paramlist.get(i));
+                                                                break;
+                                                            default:
+                                                                // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
+                                                                break;
+                                                        }
+                                                    }
+                                                }
+
+                                                // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
+                                                if (!sValue.isEmpty()) {
+
+                                                    // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
+                                                    S7control.getinstance().WriteBit(addressList0, sValue);
+                                                    System.out
+                                                            .println("Values " + sValue + " written to PLC at address "
+                                                                    + addressList0);
+                                                }
+                                            }
+                                        }
+                                    }
+                                } catch (Exception e) {
+                                    System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
+                                }
+
+                                // 鎬ュ仠
+                                // customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
+
+                                try {
+                                    // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
+                                    if (messageArray.getJSONArray(1).size() > 0) {
+                                        // 鑾峰彇娑堟伅鏁扮粍
+                                        JSONArray jsonArray = messageArray.getJSONArray(1);
+                                        // 鍒涘缓涓�涓竷灏斿�煎垪琛�
+                                        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());
+                                }
+
+                                // 瀛樼墖绛夊緟寤惰繜
+                                customS7Control.Writetime(messageArray, timeout2, 2);
+
+                                // 娓呯┖娑堟伅鍒楄〃
+                                webserver.clearMessages();
+                            }
+                        }else{
+                            log.info("Parameter2 is closed");
+                        }
+                    }
+                }
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
-            //  id
-            List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
-
-            List<String> paramlist = S7control.getinstance().readStrings(addressList1);
-
-
-            //鎵嬪姩鐘舵��
-            List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
-
-            List<Short> data = S7control.getinstance().readWords(addresses);
-
-
-            //娓呴櫎id
-            List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
-
-
-            // 鎵爜鏋�
-            List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
-            List<String> addressList3 = Arrays.asList(config.getProperty("Parameter2.scanner").split(","));
-
-//鎬ュ仠鎸夐挳
-            List<String> niuanaddressList3 = Arrays.asList(config.getProperty("Parameter2.stop").split(","));
-            List<String> timeout = Arrays.asList(config.getProperty("Parameter2.timeout").split(","));
-            String timeout2 = config.getProperty("Parameter2.timeout");
-
-
-            Long readtimeout = S7control.getinstance().readtime(timeout2);
-            List<Boolean> anniuread = S7control.getinstance().readBits(niuanaddressList3);
-
-
-            List<String> data3 = S7control.getinstance().readStrings(addressList3);
-// A01 A02 B01 B02
-
-            List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
-
-
-            List<Short> data4 = S7control.getinstance().readWords(addresses4);
-
-//      List<Long> TIME2 = Collections.singletonList(S7control.getinstance().readtime("DB100.194"));
-//      System.out.println("addressList锛�" + TIME2);
-
-
-            //
-
-
-//
-//      String[] values6 = { ".x1 ","x2 ","x3",";;x4","x5","x6","x7","x8","x9","x10","x11"};
-//      List<String> paramlist = new ArrayList<>(Arrays.asList(values6));
-//      Short[] values1 = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-//     List<Short> data = new ArrayList<>(Arrays.asList(values1));
-//      Boolean[] value4 = { false, false, false, false, false, false, false, false, false,
-//              false};
-//     List<Boolean> data2 = new ArrayList<>(Arrays.asList(value4));
-//      String[] values3 = { ".x11 ","x21 "};
-//      List<String> data3 = new ArrayList<>(Arrays.asList(values3));
-//      Short[] values4 = { 2,2,3,4};
-//      List<Short> data4 = new ArrayList<>(Arrays.asList(values4));
-//
-//
-            JSONObject jsonObject = new JSONObject();
-            short[] params = new short[data2.size()];
-            for (int i = 0; i < data2.size(); i++) {
-                boolean value = data2.get(i);
-                params[i] = value ? (short) 1 : (short) 0;
-            }
-//
-            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;
-            }
-
-            jsonObject.append("params", params);
-            jsonObject.append("params", paramlist);
-            jsonObject.append("params", data);
-            jsonObject.append("params", data3);
-            jsonObject.append("params", data4);
-            jsonObject.append("jiting", anniuparams);
-            jsonObject.append("timeout", readtimeout);
-
-
-//      WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
-//      if (sendwServer != null) {
-//        JSONObject jsonObject = new JSONObject();
-//        jsonObject.set("message", "Hello, Parameter2!");
-//        sendwServer.sendMessage(jsonObject.toString());
-//      }
-
-            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter2");
-            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);
-                            //娓呴櫎ID
-                           // customS7Control.writeBitToPLC(messageArray, addressList0, 0);
-
-
-                            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);
-                                            }
-                                        }
-                                    }
-
-                                    for (int i = 1; i <= 5; i++) {
-                                        boolean value = sValue.get(i);
-                                        if (value) {
-                                            switch (i) {
-                                                case 1:
-                                                    HomeController.UpdateTask(0, 0, paramlist.get(i));
-                                                    break;
-                                                case 2:
-                                                case 3:
-                                                case 4:
-                                                case 5:
-                                                    HomeController.UpdateTask(1, 0, paramlist.get(i));
-                                                    break;
-                                                default:
-                                                    // 澶勭悊绱㈠紩鍊间笉鍦ㄨ寖鍥村唴鐨勬儏鍐�
-                                                    break;
-                                            }
-                                        }
-                                    }
-
-                                    // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
-                                    if (!sValue.isEmpty()) {
-
-                                        // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
-                                        S7control.getinstance().WriteBit(addressList0, sValue);
-                                        System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
-                                    }
-                                }
-                            } catch (Exception e) {
-                                System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
-                            }
-
-
-
-
-
-                            //鎬ュ仠
-//                            customS7Control.writeBitToPLC(messageArray, niuanaddressList3, 1);
-
-                            try {
-                                // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
-                                if (messageArray.getJSONArray(1).size() > 0) {
-                                    // 鑾峰彇娑堟伅鏁扮粍
-                                    JSONArray jsonArray = messageArray.getJSONArray(1);
-                                    // 鍒涘缓涓�涓竷灏斿�煎垪琛�
-                                    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) {
-                                        HomeController.EndTask(0);
-
-                                    }
-                                    if (Value2) {
-                                        HomeController.EndTask(0);
-
-                                    }
-                                    // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
-                                    if (!sValue.isEmpty()) {
-
-                                        // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
-                                        S7control.getinstance().WriteBit(addressList0, sValue);
-                                        System.out.println("Values " + sValue + " written to PLC at address " + addressList0);
-                                    }
-                                }
-                            } catch (Exception e) {
-                                System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
-                            }
-
-
-
-
-                            //瀛樼墖绛夊緟寤惰繜
-                            customS7Control.Writetime(messageArray, timeout2, 2);
-
-
-                            // 娓呯┖娑堟伅鍒楄〃
-                            webserver.clearMessages();
-                        }
-                    }
-                }
-            }
         }
     }
 }
-

--
Gitblit v1.8.0