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

ZengTao

2023-12-07 de6afc2ec06724885de7cc0eb8b8cad61f8c0b3b

 springboot-vue3/src/main/java/com/example/springboot/component/PlcParameter1.java

@@ -66,30 +66,42 @@
      } catch (InterruptedException e) {
        e.printStackTrace();
      }
//      this.readValue();
//      String PlcAddress = this.name;
//      Integer Plccount = this.count;
      // this.readValue();
      // String PlcAddress = this.name;
      // Integer Plccount = this.count;

      // System.out.println(stt);
       List<Short> arraylist = S7control.getinstance().ReadWord("DB100.0", 12);
       List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
       List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
//      Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
//      List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
//      Short[] fanzhuan = { 4 };
//      List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
//      Short[] xiaoche = {5};
//      List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));


      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<Short> arraylist = S7control.getinstance().readWords(addresses);
//翻转
    List<Short> fanzhuan1 = S7control.getinstance().ReadWord("DB100.8", 1);
    List<Short> xiaoche1 = S7control.getinstance().ReadWord("DB100.12", 1);
      // Short[] values1 = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
      // List<Short> arraylist = new ArrayList<>(Arrays.asList(values1));
      // Short[] fanzhuan = { 4 };
      // List<Short> fanzhuan1 = new ArrayList<>(Arrays.asList(fanzhuan));
      // Short[] xiaoche = {5};
      // List<Short> xiaoche1 = new ArrayList<>(Arrays.asList(xiaoche));

      JSONObject jsonObject = new JSONObject();
      // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}
      // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}

      jsonObject.append("params", arraylist);
      jsonObject.append("fanzhuan", fanzhuan1);
      jsonObject.append("xiaoche", xiaoche1);
     jsonObject.append("fanzhuan", fanzhuan1);
     jsonObject.append("xiaoche", xiaoche1);

      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter1");
      if (sendwServer != null) {
@@ -99,14 +111,27 @@
      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("Parameter1");
      if (webSocketServer != null) {
        List<String> messages = webSocketServer.getMessages();
        String addressList1 = "DB100.0";
        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 addressList2 = "DB100.8";
        String addressList3 = "DB100.12";

        if (!messages.isEmpty()) {
          // 将最后一个消息转换为 short 类型的列表
          String lastMessage = messages.get(messages.size() - 1);
//        System.out.println("lastMessage：" + lastMessage);
          // System.out.println("lastMessage：" + lastMessage);
          JSONArray messageArray = new JSONArray(lastMessage);

          // 整合第 1 到 3 个数组并去掉 null 元素
@@ -135,8 +160,9 @@
              try {
                String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
                short sValue = Short.parseShort(cleanedValue.trim());
               S7control.getinstance().WriteWord(addressList1, Arrays.asList(sValue));
                System.out.println("messageValue：" + Arrays.asList(sValue) + " written to PLC at address " + addressList1);
                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);
@@ -151,8 +177,9 @@
              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);
                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);
@@ -162,16 +189,15 @@

          // 写入第三个地址
          if (!mergedList.isEmpty()) {
          S7control.getinstance().WriteWord(addressList3, mergedList);
            System.out.println("messageValue：" + mergedList + " written to PLC at address " + addressList3);
            S7control.getinstance().WriteWord(waddresses1, mergedList);
            System.out.println("messageValue：" + mergedList + " written to PLC at address " + waddresses1);
          }

          // 清空消息列表
          webSocketServer.clearMessages();
        }
      

    }
      }

    }
  }