clll
2023-11-29 86eb351c3eda127933902c927623c043eeb7210b
springboot-vue3/src/main/java/com/example/springboot/component/PlcServoManualone.java
@@ -66,28 +66,28 @@
      } 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;
      List<String> addresses = new ArrayList<>();
      addresses.add("DB103.25");
      addresses.add("DB100.144");
      addresses.add("DB100.148-161");
      // addresses.add("DB100.148-161");
      addresses.add("DB100.184");
      addresses.add("DB100.186");
      addresses.add("DB100.180");
      addresses.add("DB100.182");
      List<Short> arraylist = S7control.getinstance().readWords(addresses);
      // System.out.println(arraylist);
      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");
      // addresses2.add("DB100.162-175");
      List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
      List<String> addresses3 = new ArrayList<>();
@@ -108,32 +108,31 @@
      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<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);
//      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[] 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};
//      List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
//      Short[] values5 = {3,3};
//      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));
      // Short[] values3 = {1};
      // List<Short> arraylist3 = new ArrayList<>(Arrays.asList(values3));
      // Short[] values4 = {2};
      // List<Short> arraylist4 = new ArrayList<>(Arrays.asList(values4));
      // Short[] values5 = {3,3};
      // 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));
      // System.out.println(arraylist);
      JSONObject jsonObject = new JSONObject();
      jsonObject.append("zuhe1", arraylist);
@@ -143,9 +142,7 @@
      jsonObject.append("zuhe5", arraylist5);
      jsonObject.append("zuhe6", arraylist6);
      jsonObject.append("guzhang", arraylist7);
//      jsonObject.append("weihuiling", arraylist8);
      // jsonObject.append("weihuiling", arraylist8);
      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ServoManualone");
      if (sendwServer != null) {
@@ -158,7 +155,7 @@
        List<String> waddresses1 = new ArrayList<>();
        waddresses1.add("DB103.25");
        waddresses1.add("DB100.144");
        waddresses1.add("DB100.148-161");
        // waddresses1.add("DB100.148-161");
        waddresses1.add("DB100.184");
        waddresses1.add("DB100.186");
        waddresses1.add("DB100.180");
@@ -169,18 +166,13 @@
        waddresses2.add("DB100.188");
        waddresses2.add("DB100.190");
        waddresses2.add("DB100.146");
        waddresses2.add("DB100.162-175");
        // waddresses2.add("DB100.162-175");
        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);
          // 写入第一个地址
          if (messageArray.getJSONArray(0).size() > 0) {