Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2023-12-18 37f7f87968cfd2c400283fbf83851c39c2c4d456

 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 中字节并将其解码为字符
      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;
      }

      // 将str字符串格式转为json
      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,28 +30,17 @@
      } 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);
      List<String> addresses = new ArrayList<>();
      addresses.add("DB100.0");
      addresses.add("DB100.2");
      addresses.add("DB100.4");
      addresses.add("DB100.6");
      addresses.add("DB100.26");
      addresses.add("DB100.28");
      addresses.add("DB100.30");
      addresses.add("DB100.32");
      addresses.add("DB100.34");
      addresses.add("DB100.36");
      addresses.add("DB100.38");
      addresses.add("DB100.40");

      List<String> addresses = Arrays.asList(config.getProperty("Auto.addresses").split(","));

      List<Short> arraylist2 = S7control.getinstance().readWords(addresses);
//翻转
      List<Short> fanzhuan2 = S7control.getinstance().ReadWord("DB100.8", 1);
@@ -161,55 +114,15 @@
              }
              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) {
                    // 如果无法解析为 short 类型，则忽略该部分
                    System.err.println("Could not parse value: " + value);
                  }
                }
              }
              customS7Control.WriteWordsToPLC(messageArray, addressList2,2);

              // 写入第二个地址
              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) {
                    // 如果无法解析为 short 类型，则忽略该部分
                    System.err.println("Could not parse value: " + value);
                  }
                }
              }
              customS7Control.WriteWordsToPLC(messageArray, addressList3,3);


              // 写入第三个地址
              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) {
                    // 如果无法解析为 short 类型，则忽略该部分
                    System.err.println("Could not parse value: " + value);
                  }
                }
              }
              customS7Control.WriteWordsToPLC(messageArray, addressList4,4);


              // 写入第四个地址
              if (!mergedList.isEmpty()) {
@@ -217,20 +130,8 @@
                System.out.println("messageValue：" + mergedList + " written to PLC at address " + addressList1);
              }

              List<String> waddresses1 = Arrays.asList(config.getProperty("Auto.shusong").split(","));

              List<String> waddresses1 = new ArrayList<>();
              waddresses1.add("DB100.0");
              waddresses1.add("DB100.2");
              waddresses1.add("DB100.4");
              waddresses1.add("DB100.6");
              waddresses1.add("DB100.26");
              waddresses1.add("DB100.28");
              waddresses1.add("DB100.30");
              waddresses1.add("DB100.32");
              waddresses1.add("DB100.34");
              waddresses1.add("DB100.36");
              waddresses1.add("DB100.38");
              waddresses1.add("DB100.40");

              String addressList22 = "DB100.8";
              String addressList33 = "DB100.12";
@@ -259,38 +160,11 @@
                }

                // 写入第伍个地址
                if (messageArray.getJSONArray(8).size() > 0) {
                  Object value = messageArray.getJSONArray(8).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(addressList22, Arrays.asList(sValue));
                      System.out
                              .println("messageValue：" + Arrays.asList(sValue) + " written to PLC at address " + addressList2);
                    } catch (NumberFormatException e) {
                      // 如果无法解析为 short 类型，则忽略该部分
                      System.err.println("Could not parse value: " + value);
                    }
                  }
                }
                customS7Control.WriteWordsToPLC(messageArray, addressList22,8);


                // 写入第六个地址
                if (messageArray.getJSONArray(9).size() > 0) {
                  Object value = messageArray.getJSONArray(9).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(addressList33, Arrays.asList(sValue));
                      System.out
                              .println("messageValue：" + Arrays.asList(sValue) + " written to PLC at address " + addressList3);
                    } catch (NumberFormatException e) {
                      // 如果无法解析为 short 类型，则忽略该部分
                      System.err.println("Could not parse value: " + value);
                    }
                  }
                }
                customS7Control.WriteWordsToPLC(messageArray, addressList33,9);

                // 写入第七个地址
                if (!mergedList2.isEmpty()) {