From 9472449b4ca46f482d13b6e628660c61101b443f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 08 五月 2024 14:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter2.java |  444 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 265 insertions(+), 179 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 59124ce..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,199 +2,285 @@
 
 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;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.service.StorageCageService;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+@Slf4j
 public class PlcParameter2 extends Thread {
-  String name = "";
-  Integer count = 0;
+    @Autowired
+    StorageCageService storageCageService;
+    // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+    MessageHandler customS7Control = new MessageHandler();
+    // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+    private Configuration config;
 
-  public static String readFileToString(String filePath) throws IOException {
-    File file = new File(filePath);
-    return FileUtils.readFileToString(file, "UTF-8");
-  }
-
-  public void readValue() {
-    String str = "";
-    BufferedReader bufferedReader = null;
-    FileInputStream fileInputStream;
-    try {
-      // 浠庢枃浠朵腑璇诲彇瀛楄妭鏁版嵁瀛樺叆 fileInputStream
-      fileInputStream = new FileInputStream("CanadaMes-ui/src/configuration/address.json");
-      // 璇诲彇 fileInputStream 涓瓧鑺傚苟灏嗗叾瑙g爜涓哄瓧绗�
-      InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "utf-8");
-      // 鎻愰珮璇诲彇鏁堢巼锛屽湪 BufferedReader 鍐呭寘瑁� InputStreamReader
-      bufferedReader = new BufferedReader(inputStreamReader);
-      String line = null;
-      // 灏� bufferedReader 鍐呭涓�琛屼竴琛岃祴鍊肩粰str
-      while ((line = bufferedReader.readLine()) != null) {
-        str += line;
-      }
-
-      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
-      JSONObject jsonObject = new JSONObject(str);
-
-      // 鑾峰彇json涓殑鍊�
-      JSONArray address = jsonObject.getJSONArray("Positioning1");
-      for (int i = 0; i < address.size(); i++) {
-        JSONObject ress = (JSONObject) address.get(i);
-
-        this.name = ress.getStr("name");
-        this.count = ress.getInt("count");
-
-      }
-
-    } catch (FileNotFoundException e) {
-      e.printStackTrace();
-    } catch (UnsupportedEncodingException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
+    public PlcParameter2() throws IOException {
+        config = new Configuration("config.properties");
     }
-  }
 
-  @Override
-  public void run() {
-    while (this != null) {
-      try {
-        Thread.sleep(500);
-
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-
-
-      List<String> addressList1 = new ArrayList<>();
-//      addressList1.add("DB103.32~45");
-//      addressList1.add("DB103.46~59");
-//      addressList1.add("DB103.60~73");
-//      addressList1.add("DB103.74~101");
-//      addressList1.add("DB103.102~115");
-//      addressList1.add("DB103.116~143");
-//      addressList1.add("DB103.144~157");
-//      addressList1.add("DB103.158~171");
-//      addressList1.add("DB103.172~185");
-//      addressList1.add("DB103.200~213");
-//      addressList1.add("DB103.228~241");
-      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.156");//A01 2
-      addressList1.add("DB103.142");//A02
-      addressList1.add("DB103.212");//B01
-      addressList1.add("DB103.184");//B02
-
-
-      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<Short> data = S7control.getinstance().readWords(addresses);
-
-
-
-      List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
-      List<String> addressList3 = new ArrayList<>();
-      addressList3.add("DB106.64");
-      List<String> data3 = S7control.getinstance().readStrings(addressList3);
-
-      List<String> addresses4 = new ArrayList<>();
-      addresses4.add("DB103.52");
-      addresses4.add("DB103.54");
-      addresses4.add("DB103.56");
-      addresses4.add("DB103.60");
-
-      List<Short> data4 = S7control.getinstance().readWords(addresses4);
-
-
-//     Boolean[] values = { false, true, true, true, true, true, true, true, true,
-//            true};
-//      List<Boolean> paramlist = new ArrayList<>(Arrays.asList(values));
-//      Short[] values1 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-//     List<Short> data = new ArrayList<>(Arrays.asList(values1));
-//      Short[] values2 = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-//     List<Short> data2 = new ArrayList<>(Arrays.asList(values2));
-//      Short[] values3 = { 11};
-//     List<Short> 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;
-      }
-      jsonObject.append("params", params);
-      jsonObject.append("params", paramlist);
-      jsonObject.append("params", data);
-      jsonObject.append("params", data3);
-      jsonObject.append("params", data4);
-
-
-      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
-      if (sendwServer != null) {
-        sendwServer.sendMessage(jsonObject.toString());
-      }
-
-      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter2");
-      if (webSocketServer != null) {
-
-        List<String> messages = webSocketServer.getMessages();
-
-        String addressList = "DB101.9.2";
-
-        if (!messages.isEmpty()) {
-          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-          String lastMessage = messages.get(messages.size() - 1);
-          System.out.println("messages锛�" + messages);
-          String[] parts = lastMessage.split(",");
-          List<Integer> messageValues = new ArrayList<>();
-          for (String part : parts) {
+    @Override
+    public void run() {
+        while (this != null) {
             try {
-              // 浣跨敤姝e垯琛ㄨ揪寮忔竻闄ら潪鏁板瓧瀛楃
-              String cleanedPart = part.replaceAll("[^0-9-]", "");
-              Integer value = Integer.parseInt(cleanedPart.trim());
-              messageValues.add(value);
-            } catch (NumberFormatException e) {
-              // 濡傛灉鏃犳硶瑙f瀽涓烘暣鏁扮被鍨嬶紝鍒欏拷鐣ヨ閮ㄥ垎
-//              e.printStackTrace();
+                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();
             }
-          }
 
-          // 灏嗘秷鎭�艰浆鎹负甯冨皵鍒楄〃
-          List<Boolean> messageBooleans = new ArrayList<>();
-          for (Integer value : messageValues) {
-            messageBooleans.add(value == 1 ? true : false);
-          }
-
-          // 灏嗗竷灏斿垪琛ㄥ啓鍏� PLC
-         S7control.getinstance().WriteBit(addressList, messageBooleans);
-          System.out.println("messageValues锛�" + messageBooleans);
-          System.out.println("addressList锛�" + addressList);
-          // 娓呯┖娑堟伅鍒楄〃
-          webSocketServer.clearMessages();
         }
-      }
     }
-  }
 }

--
Gitblit v1.8.0