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/PlcManualonePosition.java |  626 +++++++++++++++++++++-----------------------------------
 1 files changed, 235 insertions(+), 391 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 0f643e0..1047d50 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -2,411 +2,255 @@
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.io.FileUtils;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
+@Slf4j
 public class PlcManualonePosition extends Thread {
-  String name = "";
-  Integer count = 0;
+    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("ManualonePosition");
-      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 PlcManualonePosition() throws IOException {
+        config = new Configuration("config.properties");
     }
-  }
-
-  @Override
-  public void run() {
-    while (this != null) {
-      try {
-        Thread.sleep(500);
-
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-      // this.readValue();
-      // String PlcAddress = this.name;
-      // Integer Plccount = this.count;
-
-      List<String> addresses = new ArrayList<>();
-      addresses.add("DB100.108");
-      addresses.add("DB100.20");
-      addresses.add("DB103.32");
-      List<Short> arraylist = S7control.getinstance().readWords(addresses);
-      // System.out.println(arraylist);
-
-      List<String> addresses2 = new ArrayList<>();
-      addresses2.add("DB100.110");
-      addresses2.add("DB100.176");
-      addresses2.add("DB103.34");
-      List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
-
-      List<String> addresses3 = new ArrayList<>();
-      addresses3.add("DB100.112");
-      addresses3.add("DB100.24");
-      addresses3.add("DB103.36");
-      List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
-
-      List<String> addresses4 = new ArrayList<>();
-      addresses4.add("DB100.114");
-      addresses4.add("DB100.178");
-      addresses4.add("DB103.40");
-      List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
-
-      List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
-      List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.44", 1);
-      List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
-      List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
-      List<String> addresses9 = new ArrayList<>();
-      addresses9.add("DB104.1.2");
-      addresses9.add("DB104.1.3");
-      addresses9.add("DB104.1.6");
-      addresses9.add("DB104.1.7");
-      List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
-
-      List<String> addresses10 = new ArrayList<>();
-      addresses10.add("DB104.9.4");
-      addresses10.add("DB104.9.5");
-      addresses10.add("DB104.9.4");
-      addresses10.add("DB104.9.5");
-      List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
-      // Short[] values1 = { 1, 2, 3 };
-      // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-      // Short[] values2 = { 1, 2, 3 };
-      // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
-      // Short[] values3 = { 1, 2, 3 };
-      // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
-      // Short[] values4 = { 1, 2, 3 };
-      // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
-      // Short[] values5 = { 5 };
-      // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
-      // Short[] values6 = { 6 };
-      // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
-      // Short[] values7 = { 7 };
-      // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
-      // Short[] values8 = { 8 };
-      // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
-      // Boolean[] values9 = { false, false, true, true };
-      // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
-      short[] params2 = new short[arraylist9.size()];
-      for (int i = 0; i < arraylist9.size(); i++) {
-        boolean value = arraylist9.get(i);
-        params2[i] = value ? (short) 1 : (short) 0;
-      }
-
-      // Boolean[] values10 = { false, false, true, true };
-      // List<Boolean> arraylist10 = new ArrayList<>(Arrays.asList(values10));
-      short[] params3 = new short[arraylist10.size()];
-      for (int i = 0; i < arraylist10.size(); i++) {
-        boolean value = arraylist10.get(i);
-        params3[i] = value ? (short) 1 : (short) 0;
-      }
-      // List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
-      arraylist5.addAll(arraylist6);
-      arraylist5.addAll(arraylist7);
-      arraylist5.addAll(arraylist8);
-
-      JSONObject jsonObject = new JSONObject();
-      // System.out.println(arraylist6);
-      jsonObject.append("zuhe1", arraylist);
-      jsonObject.append("zuhe2", arraylist2);
-      jsonObject.append("zuhe3", arraylist3);
-      jsonObject.append("zuhe4", arraylist4);
-      jsonObject.append("shishi1", arraylist5);
-      jsonObject.append("guzhang", params2);
-      jsonObject.append("weihuiling", params3);
-      // jsonObject.append("weihuiling", arraylist8);
-
-      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
-      if (sendwServer != null) {
-        sendwServer.sendMessage(jsonObject.toString());
-      }
-
-      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
-      if (webSocketServer != null) {
-        List<String> messages = webSocketServer.getMessages();
-        List<String> waddresses1 = new ArrayList<>();
-        waddresses1.add("DB100.108");
-        waddresses1.add("DB100.20");
-        waddresses1.add("DB103.32");
-
-        List<String> waddresses2 = new ArrayList<>();
-        waddresses2.add("DB100.110");
-        waddresses2.add("DB100.176");
-       waddresses2.add("DB103.34");
-
-        List<String> waddresses3 = new ArrayList<>();
-        waddresses3.add("DB100.112");
-        waddresses3.add("DB100.24");
-       waddresses3.add("DB103.36");
-
-        List<String> waddresses4 = new ArrayList<>();
-        waddresses4.add("DB100.114");
-        waddresses4.add("DB100.178");
-        waddresses4.add("DB103.40");
-
-        // 鏁呴殰鍦板潃
-        List<String> waddresses5 = new ArrayList<>();
-        // waddresses5.add("DB103.244");
-        // waddresses5.add("DB103.250");
-        waddresses5.add("DB103.252");
-        waddresses5.add("DB103.254");
-
-        // 澶嶄綅鍦板潃
-        List<String> waddresses6 = new ArrayList<>();
-        waddresses6.add("DB101.4.0");
-        waddresses6.add("DB101.4.3");
-        waddresses6.add("DB101.4.4");
-        waddresses6.add("DB101.4.6");
-
-        // 鍥為浂鍦板潃
-        List<String> waddresses7 = new ArrayList<>();
-
-        waddresses7.add("DB101.4.5");
-        waddresses7.add("DB101.4.7");
 
 
-        // System.out.println(messages.isEmpty());
-        if (!messages.isEmpty()) {
-          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-          String lastMessage = messages.get(messages.size() - 1);
-          // System.out.println("lastMessage锛�" + lastMessage);
-          JSONArray messageArray = new JSONArray(lastMessage);
-          // 鍐欏叆A01
-          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);
+    // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+    MessageHandler customS7Control = new MessageHandler();
+
+
+    public static class PLCBooleanConverter {
+
+        public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
+            // 璁$畻鎵�鏈夊垪琛ㄤ腑鍏冪礌鐨勬�绘暟
+            int totalSize = 0;
+            for (List<Boolean> list : lists) {
+                totalSize += list.size();
+            }
+
+            // 鍒涘缓涓�涓冻澶熷ぇ鐨勬暟缁勬潵瀛樻斁鎵�鏈夌殑浜岃繘鍒跺��
+            short[] binaryShortArray = new short[totalSize];
+
+            // 褰撳墠鏁扮粍濉厖浣嶇疆鎸囬拡
+            int currentIndex = 0;
+
+            // 閬嶅巻鎵�鏈夌殑鍒楄〃
+            for (List<Boolean> list : lists) {
+                // 灏嗘瘡涓竷灏斿�艰浆鎹负 0 鎴� 1 骞跺~鍏ユ暟缁�
+                for (Boolean value : list) {
+                    binaryShortArray[currentIndex++] = (short) (value ? 1 : 0);
                 }
-              }
             }
-            if (!sValue.isEmpty()) {
-              S7control.getinstance().WriteWord(waddresses1, sValue);
-              List<String> A01start = new ArrayList<>();
-              A01start.add("DB101.2.2");
-              Boolean[] a01values7 = { true};
-              List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a01values7));
-              S7control.getinstance().WriteBit(A01start, a01startval);
-              System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
-            }
-          }
 
-          // 鍐欏叆A02
-
-          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);
-              List<String> A02start = new ArrayList<>();
-              A02start.add("DB101.2.3");
-              Boolean[] a02values7 = { true};
-              List<Boolean> a01startval = new ArrayList<>(Arrays.asList(a02values7));
-              S7control.getinstance().WriteBit(A02start, a01startval);
-              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
-            }
-          }
-
-          // 鍐欏叆B01
-          if (messageArray.getJSONArray(2).size() > 0) {
-            JSONArray jsonArray = messageArray.getJSONArray(2);
-            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(waddresses3, sValue2);
-              List<String> B01start = new ArrayList<>();
-              B01start.add("DB101.2.4");
-              Boolean[]B01values7 = { true};
-              List<Boolean> B01startval = new ArrayList<>(Arrays.asList(B01values7));
-              S7control.getinstance().WriteBit(B01start, B01startval);
-              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
-            }
-          }
-
-          // 鍐欏叆B02
-          if (messageArray.getJSONArray(3).size() > 0) {
-            JSONArray jsonArray = messageArray.getJSONArray(3);
-            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(waddresses4, sValue2);
-              List<String> B02start = new ArrayList<>();
-              B02start.add("DB101.2.5");
-              Boolean[] B02values7 = { true};
-              List<Boolean> B02startval = new ArrayList<>(Arrays.asList(B02values7));
-              S7control.getinstance().WriteBit(B02start, B02startval);
-              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
-            }
-          }
-
-          // 鍐欏叆鏁呴殰鍦板潃
-          if (messageArray.getJSONArray(4).size() > 0) {
-            JSONArray jsonArray = messageArray.getJSONArray(4);
-            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(waddresses5, sValue2);
-              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses5);
-            }
-          }
-
-          // 鍐欏叆澶嶄綅鍦板潃
-          if (messageArray.getJSONArray(5).size() > 0) {
-            JSONArray jsonArray3 = messageArray.getJSONArray(5);
-            List<Boolean> sValue3 = new ArrayList<>();
-            for (int i = 0; i < jsonArray3.size(); i++) {
-              Object value = jsonArray3.get(i);
-              if (value != null && !value.toString().equals("null")) {
-                try {
-                  String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                  boolean val = "1".equals(cleanedValue.trim());
-                  sValue3.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);
-                }
-              }
-            }
-            if (!sValue3.isEmpty()) {
-              S7control.getinstance().WriteBit(waddresses6, sValue3);
-              System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses6);
-            }
-          }
-
-          // 鍐欏叆鍥為浂鍦板潃
-          if (messageArray.getJSONArray(6).size() > 0) {
-            JSONArray jsonArray3 = messageArray.getJSONArray(6);
-            List<Boolean> sValue3 = new ArrayList<>();
-            for (int i = 0; i < jsonArray3.size(); i++) {
-              Object value = jsonArray3.get(i);
-              if (value != null && !value.toString().equals("null")) {
-                try {
-                  String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                  boolean val = "1".equals(cleanedValue.trim());
-                  sValue3.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);
-                }
-              }
-            }
-            if (!sValue3.isEmpty()) {
-              S7control.getinstance().WriteBit(waddresses7, sValue3);
-              System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses7);
-            }
-          }
-
-          // 娓呯┖娑堟伅鍒楄〃
-          webSocketServer.clearMessages();
+            return binaryShortArray;
         }
-      }
     }
-  }
+
+
+    @Override
+    public void run() {
+        while (this != null) {
+            try {
+                Thread.sleep(500);
+                // this.readValue();
+            // String PlcAddress = this.name;
+            // Integer Plccount = this.count;
+
+
+            //B01缁勫悎涓湴鍧�
+           // String b01Address = config.getProperty("B01.address");
+            List<String> addresses = Arrays.asList(config.getProperty("PlcManualonePosition.addresses").split(","));
+
+            List<Short> arraylist = S7control.getinstance().readWords(addresses);
+            // System.out.println(arraylist);
+            List<String> addresses2 = Arrays.asList(config.getProperty("PlcManualonePosition.addresses2").split(","));
+
+            List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
+
+            List<String> addresses3 = Arrays.asList(config.getProperty("PlcManualonePosition.addresses3").split(","));
+
+            List<Short> arraylist3 = S7control.getinstance().readWords(addresses3);
+
+
+            List<String> addresses4 = Arrays.asList(config.getProperty("PlcManualonePosition.addresses4").split(","));
+
+            List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);
+
+
+            List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
+            List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
+            List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
+            List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
+            //鏁呴殰
+
+            List<String> addresses9 = Arrays.asList(config.getProperty("PlcManualonePosition.fault").split(","));
+
+            List<Boolean> arraylist9 = S7control.getinstance().readBits(addresses9);
+
+           //鏈洖闆�
+
+            List<String> addresses10 = Arrays.asList(config.getProperty("PlcManualonePosition.Notzero").split(","));
+
+            List<Boolean> arraylist10 = S7control.getinstance().readBits(addresses10);
+
+            //A01鍚姩鍦板潃
+            List<String> A01start = Arrays.asList(config.getProperty("mlp.A01start"));
+            //A02鍚姩鍦板潃
+            List<String> A02start = Arrays.asList(config.getProperty("mlp.A02start"));
+
+            List<String> B01start = Arrays.asList(config.getProperty("mlp.B01start"));
+
+            List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));
+
+            // 鏁呴殰鍦板潃
+            List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));
+
+
+            // 澶嶄綅鍦板潃
+            List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
+            List<Boolean> readreast = S7control.getinstance().readBits(waddresses6);
+            short[] reast6 = PLCBooleanConverter.convertListsToBinaryShortArray(readreast);
+
+            // 鍥為浂鍦板潃
+            List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
+            List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses7);
+            short[] huiling7 = PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
+
+            List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
+            List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
+            List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
+            List<Boolean> B02readstart = S7control.getinstance().readBits(B02start);
+
+            short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
+                    A01readstart, A02readstart, B01readstart, B02readstart
+            );
+
+            // Short[] values1 = { 1, 2, 3 };
+            // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+            // Short[] values2 = { 1, 2, 3 };
+            // List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+            // Short[] values3 = { 1, 2, 3 };
+            // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
+            // Short[] values4 = { 1, 2, 3 };
+            // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
+            // Short[] values5 = { 5 };
+            // List<Short> arraylist5 = new ArrayList<>(Arrays.asList(values5));
+            // Short[] values6 = { 6 };
+            // List<Short> arraylist6 = new ArrayList<>(Arrays.asList(values6));
+            // Short[] values7 = { 7 };
+            // List<Short> arraylist7 = new ArrayList<>(Arrays.asList(values7));
+            // Short[] values8 = { 8 };
+            // List<Short> arraylist8 = new ArrayList<>(Arrays.asList(values8));
+            // Boolean[] values9 = { false, false, true, true };
+            // List<Boolean> arraylist9 = new ArrayList<>(Arrays.asList(values9));
+            short[] params2 = new short[arraylist9.size()];
+            for (int i = 0; i < arraylist9.size(); i++) {
+                boolean value = arraylist9.get(i);
+                params2[i] = value ? (short) 1 : (short) 0;
+            }
+
+            // Boolean[] values10 = { false, false, true, true };
+            // List<Boolean> arraylist10 = new ArrayList<>(Arrays.asList(values10));
+            short[] params3 = new short[arraylist10.size()];
+            for (int i = 0; i < arraylist10.size(); i++) {
+                boolean value = arraylist10.get(i);
+                params3[i] = value ? (short) 1 : (short) 0;
+            }
+            // List<Short> arraylist9 = S7control.getinstance().readWords(addresses9);
+            arraylist5.addAll(arraylist6);
+            arraylist5.addAll(arraylist7);
+            arraylist5.addAll(arraylist8);
+
+            JSONObject jsonObject = new JSONObject();
+            // System.out.println(arraylist6);
+            jsonObject.append("zuhe1", arraylist);
+            jsonObject.append("zuhe2", arraylist2);
+            jsonObject.append("zuhe3", arraylist3);
+            jsonObject.append("zuhe4", arraylist4);
+            jsonObject.append("shishi1", arraylist5);
+            jsonObject.append("guzhang", params2);
+            jsonObject.append("weihuiling", params3);
+            jsonObject.append("qidong", combinedBinaryShortArray);
+            jsonObject.append("fuwei", reast6);
+            jsonObject.append("huiling", huiling7);
+
+//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+//      if (sendwServer != null) {
+//        sendwServer.sendMessage(jsonObject.toString());
+//      }
+
+            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
+            if (sendwServer != null) {
+                for (WebSocketServer webserver : sendwServer) {
+                    
+
+//      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
+                    if (webserver != null&&webserver.session.isOpen()) {
+                        webserver.sendMessage(jsonObject.toString());
+                        List<String> messages = webserver.getMessages();
+
+
+
+
+
+
+                        // System.out.println(messages.isEmpty());
+                        if (!messages.isEmpty()) {
+                            // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+                            String lastMessage = messages.get(messages.size() - 1);
+                            // System.out.println("lastMessage锛�" + lastMessage);
+                            JSONArray messageArray = new JSONArray(lastMessage);
+                            // 鍐欏叆A01
+                            customS7Control.WriteWordToPLC(messageArray, addresses, 0);
+
+
+                            // 鍐欏叆A02
+                            customS7Control.WriteWordToPLC(messageArray, addresses2, 1);
+
+                            // 鍐欏叆B01
+                            customS7Control.WriteWordToPLC(messageArray, addresses3, 2);
+
+                            // 鍐欏叆B02
+                            customS7Control.WriteWordToPLC(messageArray, addresses4, 3);
+
+
+                            // 鍐欏叆鏁呴殰鍦板潃
+
+                            customS7Control.writeBitToPLC(messageArray, waddresses5, 4);
+
+
+                            // 鍐欏叆澶嶄綅鍦板潃
+                            customS7Control.writeBitToPLC(messageArray, waddresses6, 5);
+
+                            // 鍐欏叆鍥為浂鍦板潃
+
+                            customS7Control.writeBitToPLC(messageArray, waddresses7, 6);
+                            //A01鍚姩
+                            customS7Control.writeBitToPLC(messageArray, A01start, 7);
+                            //A02鍚姩
+                            customS7Control.writeBitToPLC(messageArray, A02start, 8);
+                            //B01鍚姩
+                            customS7Control.writeBitToPLC(messageArray, B01start, 9);
+                            //B02鍚姩
+                            customS7Control.writeBitToPLC(messageArray, B02start, 10);
+
+                            // 娓呯┖娑堟伅鍒楄〃
+                            webserver.clearMessages();
+                        }
+                    }else{
+                        log.info("ManualonePosition is closed");
+                    }
+                }
+            }
+
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            
+        }
+    }
 }

--
Gitblit v1.8.0