更新合并

wu

2024-01-17 89f70f154bf778afb0d5b45455f1a0929aec4817

更新合并

 .vscode/launch.json

@@ -6,6 +6,13 @@
    "configurations": [
      {
        "type": "java",
        "name": "MyGenerator",
        "request": "launch",
        "mainClass": "MyGenerator",
        "projectName": "canadames"
      },
      {
        "type": "java",
        "name": "AuthorityApplication",
        "request": "launch",
        "mainClass": "com.example.springboot.AuthorityApplication",

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

@@ -24,12 +24,12 @@
    while (this != null) {
      try {

        Thread.sleep(100);
        Thread.sleep(50);
      } catch (InterruptedException e) {
        // \\ TODO Auto-generated catch block
        e.printStackTrace();
      }
      if (S7control.getinstance().CheckConnected() == false) {
      // if (S7control.getinstance().CheckConnected() == false) {
        spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
        spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
        jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
@@ -41,7 +41,6 @@
        // // TODO Auto-generated catch block
        // e.printStackTrace();
        // }
         spianService.selectAll("X21942610402GV");
        // 出片任务////////////////////////////////
        List<Short> outlist = S7control.getinstance().ReadWord("DB106.20", 1); // 出片车状态
        List<Short> outlist1 = S7control.getinstance().ReadWord("DB105.18", 1); // 出片任务是否启动
@@ -92,16 +91,16 @@
        List<Short> datas1ListState2 = S7control.getinstance().ReadWord("DB105.16", 1);// 获取进片车任务是否启动

        boolean B01backs = spianService.listbool("DB106.60");// b01汇报

        boolean B02backs = spianService.listbool("DB106.62");// b02汇报

        StringBuilder B01glassid = spianService.queGlassid("DB103.184", 14);// BO1的玻璃id
        StringBuilder B02glassid = spianService.queGlassid("DB103.212", 14);// B02的玻璃id

        // 当进片小车完成任务时
        if (B01backs == true) {
          // 当B01小车汇报完成时更改玻璃状态 为1
          spianService.overtask(B01glassid.toString());// 完成任务
          S7control.getinstance().WriteWord("DB106.60", (short) 0);// 恢复B01小车应答改为0
        // spianService.overtask(B01glassid.toString());// 完成任务
        // S7control.getinstance().WriteWord("DB106.60", (short) 0);// 恢复B01小车应答改为0
          boolean yingda = spianService.listbool("DB106.60");// b01汇报
          System.out.println("汇报时B01|第" + aaa + "次" + B01glassid + "应答" + yingda);
          aaa += 1;
@@ -110,12 +109,13 @@
        // 当出片小车完成任务时
        if (B02backs == true) {
          // 当B02小车汇报完成时更改玻璃状态为0
          spianService.overtask(B02glassid.toString());// 完成任务
          S7control.getinstance().WriteWord("DB106.62", (short) 0);// 恢复B02小车应答改为0
        // spianService.overtask(B02glassid.toString());// 完成任务
        // S7control.getinstance().WriteWord("DB106.62", (short) 0);// 恢复B02小车应答改为0
          System.out.println("汇报时B02|" + B02glassid);
          boolean yingda = spianService.listbool("DB106.62");// b02汇报
          System.out.println("汇报时B02|第" + aaa + "次" + B02glassid + "应答" + yingda);
        boolean yingda1 = spianService.listbool("DB106.62");// b02汇报
        System.out.println("汇报时B02|第" + aaa + "次" + B02glassid + "应答" + yingda1);
        }


        // 获取DO1数据
        StringBuilder queueid1 = spianService.queGlassid("DB106.26", 14);// 获取请求的id跟DO1同时清
@@ -165,7 +165,7 @@
        // 查询数据库
        // 推送到前端

      }
      // }
    }
  }


 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java

@@ -18,8 +18,8 @@
        System.out.println("启动完成");

        new PlcHold().start();

        new Plchome().start();
        //new huibao().start();
        //new Plchome().start();

        // new Plcalarm().start();