From 81826e66f68a37486516ee93c4e11d92a00c3fb6 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 14:43:21 +0800
Subject: [PATCH] 增加清除id调用终止出片任务

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java |  220 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 156 insertions(+), 64 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 e4889b3..cf447b0 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,7 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.example.springboot.controller.HomeController;
 import org.apache.commons.io.FileUtils;
 
 import java.io.*;
@@ -13,10 +14,16 @@
 
 public class PlcParameter2 extends Thread {
 
+    // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+    private Configuration config;
 
     // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
     MessageHandler customS7Control = new MessageHandler();
 
+
+    public PlcParameter2() throws IOException {
+        config = new Configuration("config.properties");
+    }
 
     @Override
     public void run() {
@@ -29,74 +36,40 @@
             }
 
             //  id
-            List<String> addressList1 = new ArrayList<>();
-
-            addressList1.add("DB103.44");//D01
-            addressList1.add("DB103.58");//D02
-            addressList1.add("DB103.72");//D03
-            addressList1.add("DB103.86");//D04
-            addressList1.add("DB103.100");//D05
-            addressList1.add("DB103.114");//D06
-            addressList1.add("DB103.128");//A01
-            addressList1.add("DB103.142");//A01 2
-            addressList1.add("DB103.156");//A02
-            addressList1.add("DB103.184");//B01
-            addressList1.add("DB103.212");//B02
-
+            List<String> addressList1 = Arrays.asList(config.getProperty("Parameter2.id").split(","));
 
             List<String> paramlist = S7control.getinstance().readStrings(addressList1);
 
 
             //鎵嬪姩鐘舵��
-            List<String> addresses = new ArrayList<>();
-            addresses.add("DB103.0");
-            addresses.add("DB103.2");
-            addresses.add("DB103.12");
-            addresses.add("DB103.14");
-            addresses.add("DB103.16");
-            addresses.add("DB103.18");
-            addresses.add("DB103.8");
-            addresses.add("DB103.10");
-            addresses.add("DB103.4");
-            addresses.add("DB103.6");
+            List<String> addresses = Arrays.asList(config.getProperty("Parameter2.state").split(","));
+
             List<Short> data = S7control.getinstance().readWords(addresses);
 
 
             //娓呴櫎id
-            List<String> addressList0 = new ArrayList<>();
+            List<String> addressList0 = Arrays.asList(config.getProperty("Parameter2.cleanid").split(","));
 
-            addressList0.add("DB101.9.2");
-            addressList0.add("DB101.9.3");
-            addressList0.add("DB101.9.4");
-            addressList0.add("DB101.9.5");
-            addressList0.add("DB101.9.6");
-            addressList0.add("DB101.9.7");
-
-            addressList0.add("DB101.10.0");
-            addressList0.add("DB101.10.1");
-            addressList0.add("DB101.10.2");
-            addressList0.add("DB101.10.3");
 
             // 鎵爜鏋�
             List<Boolean> data2 = S7control.getinstance().readBits(addressList0);
-            List<String> addressList3 = new ArrayList<>();
-            addressList3.add("DB103.256");
-            addressList3.add("DB103.270");
+            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");
 
 
-            List<String> niuanaddressList3 = new ArrayList<>();
-
-            niuanaddressList3.add("DB101.10.4");
+            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 = new ArrayList<>();
-            addresses4.add("DB103.32");
-            addresses4.add("DB103.34");
-            addresses4.add("DB103.36");
-            addresses4.add("DB103.40");
+
+            List<String> addresses4 = Arrays.asList(config.getProperty("Parameter2.Currentcell").split(","));
+
 
             List<Short> data4 = S7control.getinstance().readWords(addresses4);
 
@@ -140,6 +113,7 @@
             jsonObject.append("params", data3);
             jsonObject.append("params", data4);
             jsonObject.append("jiting", anniuparams);
+            jsonObject.append("timeout", readtimeout);
 
 
 //      WebSocketServer sendwServer = WebSocketServer.getWebSocketServer("Parameter2");
@@ -160,29 +134,147 @@
 
 
                         List<String> messages = webserver.getMessages();
-                        List<String> addressList = new ArrayList<>();
-
-                        addressList.add("DB101.9.2");
-                        addressList.add("DB101.9.3");
-                        addressList.add("DB101.9.4");
-                        addressList.add("DB101.9.5");
-                        addressList.add("DB101.9.6");
-                        addressList.add("DB101.9.7");
-                        addressList.add("DB101.10.0");
-                        addressList.add("DB101.10.1");
-                        addressList.add("DB101.10.2");
-                        addressList.add("DB101.10.3");
-
-
+                        
                         if (!messages.isEmpty()) {
                             // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
                             String lastMessage = messages.get(messages.size() - 1);
 //        System.out.println("lastMessage锛�" + lastMessage);
                             JSONArray messageArray = new JSONArray(lastMessage);
                             //娓呴櫎ID
-                            customS7Control.writeBitToPLC(messageArray, addressList, 0);
+                           // 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);
+//                            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);
 
 
                             // 娓呯┖娑堟伅鍒楄〃

--
Gitblit v1.8.0