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

wu

2023-11-30 0ece3ba8c92df0438af52b8de6b9225d8ada4103

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

@@ -67,7 +67,6 @@
        e.printStackTrace();
      }


      List<String> addressList1 = new ArrayList<>();
      addressList1.add("DB103.32~45");
      addressList1.add("DB103.46~59");
@@ -82,7 +81,6 @@
      addressList1.add("DB103.228~241");
      List<Boolean> paramlist = S7control.getinstance().readBits(addressList1);


      List<String> addresses = new ArrayList<>();
      addresses.add("DB103.0");
      addresses.add("DB103.2");
@@ -96,11 +94,9 @@
      addresses.add("DB103.6");
      List<Short> data = S7control.getinstance().readWords(addresses);



      List<Boolean> data2 = S7control.getinstance().ReadBits("DB101.9.2", 10);
      List<String> addressList3 = new ArrayList<>();
      addressList3.add("DB106.64-DB106.77");
      addressList3.add("DB103.6");
      List<Boolean> data3 = S7control.getinstance().readBits(addressList3);

      List<String> addresses4 = new ArrayList<>();
@@ -110,7 +106,6 @@
      addresses.add("DB106.50");

      List<Short> data4 = S7control.getinstance().readWords(addresses4);


//     Boolean[] values = { false, true, true, true, true, true, true, true, true,
//            true};
@@ -124,7 +119,6 @@
//      Short[] values4 = { 2,2,3,4};
//      List<Short> data4 = new ArrayList<>(Arrays.asList(values4));


      JSONObject jsonObject = new JSONObject();
      short[] params = new short[paramlist.size()];
      for (int i = 0; i < paramlist.size(); i++) {
@@ -133,11 +127,10 @@
      }

      jsonObject.append("params", params);
      jsonObject.append("params", data2);
      jsonObject.append("params", data);
      jsonObject.append("params", data2);
      jsonObject.append("params", data3);
      jsonObject.append("params", data4);


      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Parameter2");
      if (sendwServer != null) {