From fb32fb5bb4be336171dca41e62d3d6c6c5803f34 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 12 十二月 2023 17:02:55 +0800
Subject: [PATCH] A01启动 B01启动 增加plc地址 单独写入

---
 springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java |  371 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 216 insertions(+), 155 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
index 70b6ea5..7d5e20e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.google.common.primitives.Bytes;
 import org.apache.commons.io.FileUtils;
 
 import java.io.*;
@@ -10,116 +11,180 @@
 import java.util.List;
 
 public class PlcServoManualone extends Thread {
-  String name = "";
-  Integer count = 0;
 
-  public static String readFileToString(String filePath) throws IOException {
-    File file = new File(filePath);
-    return FileUtils.readFileToString(file, "UTF-8");
+
+  // 鐢ㄤ簬瀛樺偍搴旂敤绋嬪簭鐨勯厤缃俊鎭�
+  private Configuration config;
+
+  // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+  MessageHandler customS7Control = new MessageHandler();
+
+
+  public PlcServoManualone() throws IOException {
+    config = new Configuration("config.properties");
   }
 
-  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;
+//灏嗗竷灏斿垪琛ㄨ浆鎹负浜岃繘鍒剁殑 short 鏁扮粍
+  public static class PLCBooleanConverter {
+
+    public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
+      // 璁$畻鎵�鏈夊垪琛ㄤ腑鍏冪礌鐨勬�绘暟
+      int totalSize = 0;
+      for (List<Boolean> list : lists) {
+        totalSize += list.size();
       }
 
-      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
-      JSONObject jsonObject = new JSONObject(str);
+      // 鍒涘缓涓�涓冻澶熷ぇ鐨勬暟缁勬潵瀛樻斁鎵�鏈夌殑浜岃繘鍒跺��
+      short[] binaryShortArray = new short[totalSize];
 
-      // 鑾峰彇json涓殑鍊�
-      JSONArray address = jsonObject.getJSONArray("ServoManualone");
-      for (int i = 0; i < address.size(); i++) {
-        JSONObject ress = (JSONObject) address.get(i);
+      // 褰撳墠鏁扮粍濉厖浣嶇疆鎸囬拡
+      int currentIndex = 0;
 
-        this.name = ress.getStr("name");
-        this.count = ress.getInt("count");
-
+      // 閬嶅巻鎵�鏈夌殑鍒楄〃
+      for (List<Boolean> list : lists) {
+        // 灏嗘瘡涓竷灏斿�艰浆鎹负 0 鎴� 1 骞跺~鍏ユ暟缁�
+        for (Boolean value : list) {
+          binaryShortArray[currentIndex++] = (short) (value ? 1 : 0);
+        }
       }
 
-    } catch (FileNotFoundException e) {
-      e.printStackTrace();
-    } catch (UnsupportedEncodingException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
+      return binaryShortArray;
     }
   }
+
+//璇诲彇id
+  public StringBuilder queGlassid(String address,int count) {
+    StringBuilder writedstrIdOut = new StringBuilder();
+    byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
+    if (writedglassidbytesOut != null) {
+      // 鑾峰彇鐜荤拑id
+      for (byte iditem : writedglassidbytesOut) {
+        writedstrIdOut.append((char) iditem);
+      }
+    }
+    return writedstrIdOut;
+  }
+
 
   @Override
   public void run() {
     while (this != null) {
       try {
-        Thread.sleep(500);
+        Thread.sleep(1000);
 
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
-//      this.readValue();
-//      String PlcAddress = this.name;
-//      Integer Plccount = this.count;
 
 
-      List<String> addresses = new ArrayList<>();
-      addresses.add("DB103.25");
-      addresses.add("DB100.144");
-      addresses.add("DB100.148-161");
-      addresses.add("DB100.184");
-      addresses.add("DB100.186");
-      addresses.add("DB100.180");
-      addresses.add("DB100.182");
+
+//A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
+      List<String> addresses = Arrays.asList(config.getProperty("A01.addresses").split(","));
+      //System.out.println(addresses);
 
       List<Short> arraylist = S7control.getinstance().readWords(addresses);
 
-      List<String> addresses2 = new ArrayList<>();
-      addresses2.add("DB103.26");
-      addresses2.add("DB100.188");
-      addresses2.add("DB100.190");
-      addresses2.add("DB100.146");
-      addresses2.add("DB100.162-175");
+//A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
+      List<String> addresses2 = Arrays.asList(config.getProperty("A02.addresses").split(","));
       List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
 
-      List<String> addresses3 = new ArrayList<>();
-      addresses3.add("DB103.42");
+      //A01缈昏浆鍦板潃
+      List<String> addresses3 = Arrays.asList(config.getProperty("A01.flipAddress"));
       List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
 
-      List<String> addresses4 = new ArrayList<>();
-      addresses4.add("DB103.46");
-      List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+      //A02缈昏浆鍦板潃
+      List<String> addresses4 = Arrays.asList(config.getProperty("A02.flipAddress"));
 
-      List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.27", 2);
-      List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.29", 2);
-      List<String> addresses7 = new ArrayList<>();
-      addresses7.add("DB104.24");
-      addresses7.add("DB104.26");
-      addresses7.add("DB104.20");
-      addresses7.add("DB104.22");
-      addresses7.add("DB104.28");
-      addresses7.add("DB104.30");
-      List<Short> arraylist7 = S7control.getinstance().readWords(addresses7);
-//      List<String> addresses8 = new ArrayList<>();
-//      addresses8.add("DB103.26");
-//      addresses8.add("DB103.26");
-//      addresses8.add("DB103.26");
-//      addresses8.add("DB103.26");
-//      List<Short> arraylist8 = S7control.getinstance().readWords(addresses8);
+      List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+     //B01缁勫悎涓湴鍧�
+      String b01Address = config.getProperty("B01.address");
+      List<Short> arraylist5 = S7control.getinstance().ReadWord(b01Address, 2);
+      //B02缁勫悎鍦板潃
+      String b02Address = config.getProperty("B02.address");
+      List<Short> arraylist6 = S7control.getinstance().ReadWord(b02Address, 2);
+//      System.out.println(b02Address);
+     // 鎵�鏈夋晠闅滄寜閽湴鍧�
+      List<String> addresses7 = Arrays.asList(config.getProperty("faultButtonAddresses").split(","));
+      List<Boolean> arraylist7 = S7control.getinstance().readBits(addresses7);
+
+      //A01鍚姩鍦板潃
+      List<String> A01start = Arrays.asList(config.getProperty("A01start"));
+      //A02鍚姩鍦板潃
+      List<String> A02start = Arrays.asList(config.getProperty("A02start"));
+//A01鍗婅嚜鍔ㄥ湴鍧�
+      List<String> A01Bstart = Arrays.asList(config.getProperty("A01Bstart"));
+      //A02鍗婅嚜鍔ㄥ湴鍧�
+      List<String> A02Bstart = Arrays.asList(config.getProperty("A02Bstart"));
+      //
+      List<String> abortresumeTasks = Arrays.asList(config.getProperty("abortresumeTasks"));
+      //鍥為浂鎸夐挳鍦板潃
+      List<String> waddresses4 = Arrays.asList(config.getProperty("HomedButtonAddresses").split(","));
+      // 鎵�鏈夊浣嶆寜閽湴鍧�
+      List<String> Reset = Arrays.asList(config.getProperty("resetButtonAddresses").split(","));
+//      System.out.println(Reset);
+      // 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
+      List<String> addresses8 = Arrays.asList(config.getProperty("notHomedButtonAddresses").split(","));
+      // 杩涚墖id鍦板潃
+      String inputGlassIdAddress = config.getProperty("inputGlassIdAddress");
+      String outputGlassIdAddress = config.getProperty("outputGlassIdAddress");
+      StringBuilder queueid1 = queGlassid(inputGlassIdAddress, 14);
+      // 瀛樼墖id鍦板潃
+      StringBuilder queueid2 = queGlassid(outputGlassIdAddress, 14);
+//A01 A02鍚姩   鍗婅嚜鍔ㄥ惎鍔�
+      List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+      List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+      List<Boolean> A01readBstart = S7control.getinstance().readBits(A01Bstart);
+      List<Boolean> A02readsBtart = S7control.getinstance().readBits(A02Bstart);
+
+      List<Boolean> resumeTasks = S7control.getinstance().readBits(abortresumeTasks);
+
+      short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+              A01readBstart, A01readstart,   A02readsBtart,A02readstart
+      );
+
+//      System.out.println(A01readBstart);
+
+// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
+      short[] params2 = new short[arraylist7.size()];
+      for (int i = 0; i < arraylist7.size(); i++) {
+        boolean value = arraylist7.get(i);
+        params2[i] = value ? (short) 1 : (short) 0;
+      }
+
+//鎬ュ仠涓鎸夐挳
+      short[] resumeTask = new short[resumeTasks.size()];
+      for (int i = 0; i < resumeTasks.size(); i++) {
+        boolean value = resumeTasks.get(i);
+        resumeTask[i] = value ? (short) 1 : (short) 0;
+      }
+
+      List<Boolean> Reset1 = S7control.getinstance().readBits(Reset);
+    //  System.out.println(Reset1);
+// 鎵�鏈夋晠闅滄寜閽浆鎹负1鍜�0
+      short[] rReset = new short[Reset1.size()];
+      for (int i = 0; i < Reset1.size(); i++) {
+        boolean value = Reset1.get(i);
+        rReset[i] = value ? (short) 1 : (short) 0;
+      }
+
+
+//鎵�鏈夋湭鍥為浂鎸夐挳杞崲涓�1鍜�0
+      List<Boolean> arraylist8 = S7control.getinstance().readBits(addresses8);
+      short[] params = new short[arraylist8.size()];
+      for (int i = 0; i < arraylist8.size(); i++) {
+        boolean value = arraylist8.get(i);
+        params[i] = value ? (short) 1 : (short) 0;
+      }
+
+
+
+
 
 //      Short[] values1 = { 1, 2, 3, 4, 5, 6, 7};
 //      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
 //      Short[] values2 = { 1, 2, 3, 4, 5};
 //      List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-
+//
 //      Short[] values3 = {1};
 //      List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
 //      Short[] values4 = {2};
@@ -128,11 +193,26 @@
 //      List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
 //      Short[] values6 = { 4,4};
 //      List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
-//      Short[] values7 = { 1,1,1,1,1,1};
-//      List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
-//      Short[] values8 = { 1,1,1,1,1,1};
-//      List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
-
+//      Boolean[] values7 = { false, true, true, true, true, true};
+//     List<Boolean> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+//      Boolean[] values8 = { false, true, true, true, true, true};
+//      List<Boolean> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+//
+//      String queueid1 = "x1234567890123";
+//      String queueid2 = "x1234567890123";
+//
+//      short[] params2 = new short[arraylist7.size()];
+//      for (int i = 0; i < arraylist7.size(); i++) {
+//        boolean value = arraylist7.get(i);
+//        params2[i] = value ? (short) 1 : (short) 0;
+//      }
+//
+//
+//      short[] params = new short[arraylist8.size()];
+//      for (int i = 0; i < arraylist8.size(); i++) {
+//        boolean value = arraylist8.get(i);
+//        params[i] = value ? (short) 1 : (short) 0;
+//      }
 
       JSONObject jsonObject = new JSONObject();
 
@@ -142,95 +222,76 @@
       jsonObject.append("zuhe4", arraylist4);
       jsonObject.append("zuhe5", arraylist5);
       jsonObject.append("zuhe6", arraylist6);
-      jsonObject.append("guzhang", arraylist7);
-//      jsonObject.append("weihuiling", arraylist8);
+      jsonObject.append("guzhang", params2);
+   jsonObject.append("weihuiling", params);
+      jsonObject.append("jinpianid", queueid1);
+      jsonObject.append("qupianid", queueid2);
+      jsonObject.append("fuwei", rReset);
+      jsonObject.append("qidong", combinedBinaryShortArray);
+      jsonObject.append("resumeTasks", resumeTask);
 
 
 
-      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
+//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
+//      if (sendwServer != null) {
+//        sendwServer.sendMessage(jsonObject.toString());
+//      }
+
+      ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
       if (sendwServer != null) {
-        sendwServer.sendMessage(jsonObject.toString());
-      }
-
-      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ServoManualone");
-      if (webSocketServer != null) {
-        List<String> messages = webSocketServer.getMessages();
-        List<String> waddresses1 = new ArrayList<>();
-        waddresses1.add("DB103.25");
-        waddresses1.add("DB100.144");
-        waddresses1.add("DB100.148-161");
-        waddresses1.add("DB100.184");
-        waddresses1.add("DB100.186");
-        waddresses1.add("DB100.180");
-        waddresses1.add("DB100.182");
-
-        List<String> waddresses2 = new ArrayList<>();
-        waddresses2.add("DB103.26");
-        waddresses2.add("DB100.188");
-        waddresses2.add("DB100.190");
-        waddresses2.add("DB100.146");
-        waddresses2.add("DB100.162-175");
+        for (WebSocketServer webserver : sendwServer) {
+          webserver.sendMessage(jsonObject.toString());
 
 
+          if (webserver != null) {
+            List<String> messages = webserver.getMessages();
 
-        if (!messages.isEmpty()) {
-          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-          String lastMessage = messages.get(messages.size() - 1);
+
+            if (!messages.isEmpty()) {
+              // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+              String lastMessage = messages.get(messages.size() - 1);
 //        System.out.println("lastMessage锛�" + lastMessage);
-          JSONArray messageArray = new JSONArray(lastMessage);
+              JSONArray messageArray = new JSONArray(lastMessage);
+
+
+              // 鍐欏叆AO1缁勫悎
+              customS7Control.WriteWordToPLC(messageArray, addresses,0);
+
+              //A01鍗婅嚜鍔ㄥ惎鍔�
+              customS7Control.writeBitToPLC( messageArray, A01start,8);
+
+
+              // 鍐欏叆AO2缁勫悎
+              customS7Control.WriteWordToPLC(messageArray, addresses2,1);
+              //A02鍗婅嚜鍔ㄥ惎鍔�
+
+              customS7Control.writeBitToPLC( messageArray, A02start,9);
 
 
 
+              // 澶嶄綅鎸夐挳鍐欏叆
+              customS7Control.writeBitToPLC( messageArray, Reset,2);
 
-          // 鍐欏叆绗竴涓湴鍧�
-          if (messageArray.getJSONArray(0).size() > 0) {
-            JSONArray jsonArray = messageArray.getJSONArray(0);
-            List<Short> 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-]", "");
-                  short val = Short.parseShort(cleanedValue.trim());
-                  sValue.add(val);
-                  System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
-                } catch (NumberFormatException e) {
-                  // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                  System.err.println("Could not parse value: " + value);
-                }
-              }
-            }
-            if (!sValue.isEmpty()) {
-              S7control.getinstance().WriteWord(waddresses1, sValue);
-              System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
+              //鍥為浂鎸夐挳鍐欏叆
+              customS7Control.writeBitToPLC( messageArray, waddresses4,3);
+
+              // 杩涚墖ID鍐欏叆
+              customS7Control.writeStringToPLC(  messageArray,inputGlassIdAddress,4);
+              //鍙栫墖ID鍐欏叆
+              customS7Control.writeStringToPLC(  messageArray,outputGlassIdAddress,5);
+
+              //A01鍗婅嚜鍔�
+              customS7Control.writeBitToPLC( messageArray, A01Bstart,6);
+
+            //A02鍗婅嚜鍔�
+              customS7Control.writeBitToPLC( messageArray, A02Bstart,7);
+
+
+
+              // 娓呯┖娑堟伅鍒楄〃
+              webserver.clearMessages();
             }
           }
-
-          if (messageArray.getJSONArray(1).size() > 0) {
-            JSONArray jsonArray = messageArray.getJSONArray(1);
-            List<Short> sValue2 = 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-]", "");
-                  short val = Short.parseShort(cleanedValue.trim());
-                  sValue2.add(val);
-                  System.out.println("messageValue锛�" + Arrays.asList(val) + " added to the list");
-                } catch (NumberFormatException e) {
-                  // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                  System.err.println("Could not parse value: " + value);
-                }
-              }
-            }
-            if (!sValue2.isEmpty()) {
-              S7control.getinstance().WriteWord(waddresses2, sValue2);
-              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
-            }
-          }
-
-          // 娓呯┖娑堟伅鍒楄〃
-          webSocketServer.clearMessages();
         }
       }
     }

--
Gitblit v1.8.0