From 0d3f741da10c048bc4eb25c4b46b842759f54905 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 26 一月 2024 13:52:24 +0800
Subject: [PATCH] 增加测试位 ,标志位,报警 DB区

---
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java |  259 ++++++++++++++++++++++-----------------------------
 1 files changed, 113 insertions(+), 146 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
index 15e3552..c1cc9db 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSetting.java
@@ -10,53 +10,17 @@
 import java.util.List;
 
 public class PLCAutomaticParameterSetting 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 PLCAutomaticParameterSetting() 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;
-      }
-
-      // 灏唖tr瀛楃涓叉牸寮忚浆涓簀son
-      JSONObject jsonObject = new JSONObject(str);
-
-      // 鑾峰彇json涓殑鍊�
-      JSONArray address = jsonObject.getJSONArray("address");
-      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();
-    }
-  }
-
   @Override
   public void run() {
     while (this != null) {
@@ -66,23 +30,37 @@
       } catch (InterruptedException e) {
         e.printStackTrace();
       }
-      // this.readValue();
-      // String PlcAddress = this.name;
-      // Integer Plccount = this.count;
+
 
       // System.out.println(stt);
+
       List<Short> arraylist = S7control.getinstance().ReadWord("DB100.120", 8);
       List<Short> dache1 = S7control.getinstance().ReadWord("DB100.18", 1);
       List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.22", 1);
       List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.14", 1);
-      // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
-      // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
-      // Short[] fanzhuan = { 4 };
-      // List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
-      // Short[] dache = { 5 };
-      // List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
-      // Short[] xiaoche = { 6 };
-      // List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+      List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));
+      List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
+      //System.out.println("lastMessage锛�" + arraylist2);
+//缈昏浆
+      List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
+      List<Short> xiaoche2 = S7control.getinstance().ReadWord("DB100.12", 1);
+
+
+//       Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8 };
+//       List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
+//       Short[] fanzhuan = { 4 };
+//       List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
+//       Short[] dache = { 5 };
+//       List<Short> dache1 = new ArrayList<>(Arrays.asList(dache));
+//       Short[] xiaoche = { 6 };
+//       List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));
+//
+//       Short[] values2 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+//       List<Short> arraylist2 = new ArrayList<>(Arrays.asList(values2));
+//       Short[] fanzhuan22 = { 4 };
+//       List<Short> fanzhuan2 = new ArrayList<>(Arrays.asList(fanzhuan22));
+//       Short[] xiaoche22 = {5};
+//       List<Short> xiaoche2 = new ArrayList<>(Arrays.asList(xiaoche22));
 
       JSONObject jsonObject = new JSONObject();
       // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
@@ -92,111 +70,100 @@
       jsonObject.append("dache1", dache1);
       jsonObject.append("xiaoche", xiaoche1);
       jsonObject.append("fanzhuan", fanzhuan1);
-//
-//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
-//      if (sendwServer != null) {
-//        sendwServer.sendMessage(jsonObject.toString());
-//      }
+      jsonObject.append("params2", arraylist2);
+      jsonObject.append("fanzhuan2", fanzhuan2);
+      jsonObject.append("xiaoche2", xiaoche2);
+
       ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
       if (sendwServer != null) {
         for (WebSocketServer webserver : sendwServer) {
           webserver.sendMessage(jsonObject.toString());
 
 //      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");
-      if (webserver != null) {
-        List<String> messages = webserver.getMessages();
-        String addressList1 = "DB100.120";
-        String addressList2 = "DB100.18";
-        String addressList3 = "DB100.22";
-        String addressList4 = "DB100.14";
+          if (webserver != null) {
+            List<String> messages = webserver.getMessages();
+            String addressList1 = "DB100.120";
+            String addressList2 = "DB100.18";
+            String addressList3 = "DB100.22";
+            String addressList4 = "DB100.14";
 
-        if (!messages.isEmpty()) {
-          // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
-          String lastMessage = messages.get(messages.size() - 1);
-          // System.out.println("lastMessage锛�" + lastMessage);
-          JSONArray messageArray = new JSONArray(lastMessage);
+            if (!messages.isEmpty()) {
+              // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+              String lastMessage = messages.get(messages.size() - 1);
+              // System.out.println("lastMessage锛�" + lastMessage);
+              JSONArray messageArray = new JSONArray(lastMessage);
 
-          // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
-          List<Short> mergedList = new ArrayList<>();
-          for (int i = 0; i < 2; i++) {
-            JSONArray sublist = messageArray.getJSONArray(i);
-            for (int j = 0; j < sublist.size(); j++) {
-              Object value = sublist.get(j);
-              if (value != null && !value.toString().equals("null")) {
-                try {
-                  String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                  short sValue = Short.parseShort(cleanedValue.trim());
-                  mergedList.add(sValue);
-                } catch (NumberFormatException e) {
-                  // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                  System.err.println("Could not parse value: " + value);
+              // 鏁村悎绗� 1 鍒� 2 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+              List<Short> mergedList = new ArrayList<>();
+              for (int i = 0; i < 2; i++) {
+                JSONArray sublist = messageArray.getJSONArray(i);
+                for (int j = 0; j < sublist.size(); j++) {
+                  Object value = sublist.get(j);
+                  if (value != null && !value.toString().equals("null")) {
+                    try {
+                      String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+                      short sValue = Short.parseShort(cleanedValue.trim());
+                      mergedList.add(sValue);
+                    } catch (NumberFormatException e) {
+                      // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+                      System.err.println("Could not parse value: " + value);
+                    }
+                  }
                 }
               }
-            }
-          }
-          System.out.println(messageArray);
-          // 鍐欏叆绗竴涓湴鍧�
-          if (messageArray.getJSONArray(2).size() > 0) {
-            Object value = messageArray.getJSONArray(2).get(0);
-            if (value != null && !value.toString().equals("null")) {
-              try {
-                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                short sValue = Short.parseShort(cleanedValue.trim());
-                S7control.getinstance().WriteWord(addressList2, Arrays.asList(sValue));
-                System.out
-                        .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
-              } catch (NumberFormatException e) {
-                // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                System.err.println("Could not parse value: " + value);
+              System.out.println(messageArray);
+              // 鍐欏叆绗竴涓湴鍧�
+              customS7Control.WriteWordsToPLC(messageArray, addressList2,2);
+              // 鍐欏叆绗簩涓湴鍧�
+              customS7Control.WriteWordsToPLC(messageArray, addressList3,3);
+              // 鍐欏叆绗笁涓湴鍧�
+              customS7Control.WriteWordsToPLC(messageArray, addressList4,4);
+              // 鍐欏叆绗洓涓湴鍧�
+              if (!mergedList.isEmpty()) {
+                S7control.getinstance().WriteWord(addressList1, mergedList);
+                System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
+              }
+
+              List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));
+              String addressList22 = "DB100.8";
+              String addressList33 = "DB100.12";
+              if (!messages.isEmpty()) {
+                // 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
+                // 鏁村悎绗� 1 鍒� 3 涓暟缁勫苟鍘绘帀 null 鍏冪礌
+                List<Short> mergedList2 = new ArrayList<>();
+                for (int i = 5; i < 8; i++) {
+                  JSONArray sublist = messageArray.getJSONArray(i);
+                  for (int j = 0; j < sublist.size(); j++) {
+                    Object value = sublist.get(j);
+                    if (value != null && !value.toString().equals("null")) {
+                      try {
+                        String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+                        short sValue = Short.parseShort(cleanedValue.trim());
+                        mergedList2.add(sValue);
+                      } catch (NumberFormatException e) {
+                        // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+                        System.err.println("Could not parse value: " + value);
+                      }
+                    }
+                  }
+                }
+
+                // 鍐欏叆绗紞涓湴鍧�
+                customS7Control.WriteWordsToPLC(messageArray, addressList22,8);
+                // 鍐欏叆绗叚涓湴鍧�
+                customS7Control.WriteWordsToPLC(messageArray, addressList33,9);
+                // 鍐欏叆绗竷涓湴鍧�
+                if (!mergedList2.isEmpty()) {
+                  S7control.getinstance().WriteWord(waddresses1, mergedList2);
+                  System.out.println("messageValue锛�" + mergedList2 + " written to PLC at address " + waddresses1);
+                }
+                // 娓呯┖娑堟伅鍒楄〃
+                webserver.clearMessages();
               }
             }
           }
 
-          // 鍐欏叆绗簩涓湴鍧�
-          if (messageArray.getJSONArray(3).size() > 0) {
-            Object value = messageArray.getJSONArray(3).get(0);
-            if (value != null && !value.toString().equals("null")) {
-              try {
-                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                short sValue = Short.parseShort(cleanedValue.trim());
-                S7control.getinstance().WriteWord(addressList3, Arrays.asList(sValue));
-                System.out
-                        .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
-              } catch (NumberFormatException e) {
-                // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                System.err.println("Could not parse value: " + value);
-              }
-            }
-          }
-
-          // 鍐欏叆绗笁涓湴鍧�
-          if (messageArray.getJSONArray(4).size() > 0) {
-            Object value = messageArray.getJSONArray(4).get(0);
-            if (value != null && !value.toString().equals("null")) {
-              try {
-                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
-                short sValue = Short.parseShort(cleanedValue.trim());
-                S7control.getinstance().WriteWord(addressList4, Arrays.asList(sValue));
-                System.out
-                        .println("messageValue锛�" + Arrays.asList(sValue) + " written to PLC at address " + addressList4);
-              } catch (NumberFormatException e) {
-                // 濡傛灉鏃犳硶瑙f瀽涓� short 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
-                System.err.println("Could not parse value: " + value);
-              }
-            }
-          }
-
-          // 鍐欏叆绗洓涓湴鍧�
-          if (!mergedList.isEmpty()) {
-            S7control.getinstance().WriteWord(addressList1, mergedList);
-            System.out.println("messageValue锛�" + mergedList + " written to PLC at address " + addressList1);
-          }
-
-          // 娓呯┖娑堟伅鍒楄〃
-          webserver.clearMessages();
         }
-      }}
-
       }
 
     }

--
Gitblit v1.8.0