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

ZengTao

2024-05-13 c85904597bf93e0fbae321093a970dd973b0f64f

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

@@ -25,7 +25,7 @@
  private ResourceLoader resourceLoader;
  private volatile static PlcParameter1Review instance = null;

  private PlcParameter1Review() {
  public PlcParameter1Review() {
    init();
  }

@@ -93,25 +93,37 @@
      } catch (InterruptedException e) {
        e.printStackTrace();
      }
      byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());
     byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());

      //byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};

      plcParameterObject.setPlcParameterList(getplcvlues);
      int index = plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddressIndex();
      S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);

     int index = plcParameterObject.getPlcParameter("A01ID").getAddressIndex();
      System.out.println(index);
      plcParameterObject.getPlcParameter("A01ID").getAddress(index);
      System.out.println(plcParameterObject.getPlcParameter("A01ID").getAddress(index));

     // S7control.getinstance().WriteWord(plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getAddress(index), (short) 100);

      List<String> addresses = new ArrayList<>();
      addresses.add("conveyorVelocity(AutoFAST)");
      addresses.add("conveyorVelocity(AutoSLOW)");
      addresses.add("conveyorVelocity(Manual)");
      addresses.add("A01A02TURNJOGVelocity");
      addresses.add("A01A02TRAVELJOGVelocity");

      plcParameterObject.getPlcParameterValues(addresses);
      addresses.add("conveyorVelocity(AutoFAST)");
      addresses.add("A01ID");
     //addresses.add("conveyorVelocity(AutoSLOW)");
//      addresses.add("A01A02TURNJOGVelocity");
//     addresses.add("A01A02TRAVELJOGVelocity");


      System.out.println(plcParameterObject.getPlcParameterValues(addresses));


      JSONObject jsonObject = new JSONObject();

      jsonObject.append("params", plcParameterObject.getPlcParameterValues(addresses));
      jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("conveyorVelocity(AutoFAST)").getValue());
      jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("").getValue());
     // jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("").getValue());


      ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Parameter1");
      if (sendwServer != null) {
@@ -120,6 +132,7 @@
          webserver.sendMessage(jsonObject.toString());



          if (webserver != null) {

            List<String> messages = webserver.getMessages();