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

wuyouming666

2024-05-09 c0b596275d583b0874e501f49a90e7a1dfd879e3

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

@@ -23,21 +23,22 @@

  @Override
  public void run() {

    spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
      spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
      
      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
    while (this != null) {
      try {
        spianService.result=new ArrayList<>();
        Thread.sleep(300);
        // if (S7control.getinstance().CheckConnected() == false) {
      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
      spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
      
      jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
      // 根据玻璃id获取订单号,单独数据源
      
      // try {
      //   spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
        
      //   //spianService.selectAll(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","",""));
      //   north_glass_buffer1 aa=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId("X12345610102GV","","");
      //   spianMapper.UpdataAddCage2("123", "123", aa, 5, 1, 9, 2,2000.00);
      // } catch (SQLException e) {
      //   // TODO Auto-generated catch block
      //   e.printStackTrace();
@@ -166,13 +167,14 @@
      north_glass_buffer1 glass2 =new north_glass_buffer1();

      try {
        if(queueid1.toString()!=""){
          glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01玻璃信息
        if(Plchome.dbconnected==true){
          if(queueid1.toString()!=""){
            glass1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid1.toString(),"","");// D01玻璃信息
          }
          if(queueid2.toString()!=""){
            glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02玻璃信息
          }
        }
        if(queueid2.toString()!=""){
          glass2 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdplchold(queueid2.toString(),"","");// D02玻璃信息
        }
        
      } catch (SQLException e) {
        e.printStackTrace();
      }
@@ -204,7 +206,7 @@
        }

      }
      System.out.println(spianService.result);
      // System.out.println(spianService.result);

      // 查询数据库
      // 推送到前端