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

wu

2023-12-11 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0

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

@@ -84,10 +84,10 @@
      addresses4.add("DB103.40");
      List<Short> arraylist4 = S7control.getinstance().readWords(addresses4);

      List<Short> arraylist5 = S7control.getinstance().ReadWord("DB103.40", 1);
      List<Short> arraylist6 = S7control.getinstance().ReadWord("DB103.44", 1);
      List<Short> arraylist7 = S7control.getinstance().ReadWord("DB103.48", 1);
      List<Short> arraylist8 = S7control.getinstance().ReadWord("DB103.50", 1);
      List<Short> arraylist5 = S7control.getinstance().ReadWord("DB106.0", 1);
      List<Short> arraylist6 = S7control.getinstance().ReadWord("DB106.12", 1);
      List<Short> arraylist7 = S7control.getinstance().ReadWord("DB106.40", 1);
      List<Short> arraylist8 = S7control.getinstance().ReadWord("DB106.50", 1);
      List<String> addresses9 = new ArrayList<>();
      addresses9.add("DB104.1.2");
      addresses9.add("DB104.1.3");
@@ -116,7 +116,7 @@
      List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
      List<Boolean> B02readstart = S7control.getinstance().readBits(B02start);

      short[] combinedBinaryShortArray = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(
      short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
              A01readstart,  A02readstart,B01readstart, B02readstart
      );

@@ -167,14 +167,19 @@
      jsonObject.append("weihuiling", params3);
      jsonObject.append("qidong", combinedBinaryShortArray);

      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
      if (sendwServer != null) {
        sendwServer.sendMessage(jsonObject.toString());
      }
//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
//      if (sendwServer != null) {
//        sendwServer.sendMessage(jsonObject.toString());
//      }

      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
      if (webSocketServer != null) {
        List<String> messages = webSocketServer.getMessages();
      ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
      if (sendwServer != null) {
        for (WebSocketServer webserver : sendwServer) {
          webserver.sendMessage(jsonObject.toString());

//      WebSocketServer webSocketServer = WebSocketServer.sessionMap.get("ManualonePosition");
      if (webserver != null) {
        List<String> messages = webserver.getMessages();
        List<String> waddresses1 = new ArrayList<>();
        waddresses1.add("DB100.108");
        waddresses1.add("DB100.20");
@@ -256,7 +261,6 @@
              }



              System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
            }
          }
@@ -293,7 +297,6 @@
                // 写入新的位值列表
                S7control.getinstance().WriteBit(A02start, a02startval);
              }



              System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
@@ -444,8 +447,9 @@
          }

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