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

clll

2023-09-11 ad2cf148e0bc95f95bb758fe12acc5b664b2def5

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

@@ -1,32 +1,60 @@
package com.example.springboot.component;

import java.util.List;

import javax.websocket.Session;

import com.example.springboot.service.SpianService;
import com.example.springboot.mapper.AlarmMapper;

import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;

public class PlcHold extends Thread {

  private AlarmMapper alarmMapper;

  private SpianService spianService;

  @Override
  public void run() {
    
    while (this != null) {
      try {

        Thread.sleep(10000);
        Thread.sleep(500);
      } catch (InterruptedException e) {
        // TODO Auto-generated catch block
        e.printStackTrace();
      }
      List<Boolean> bitlist = S7control.getinstance().ReadBits("DB2.0.0", 100);
      spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
      //spianService.selectout("112");

      List<Short> paramlist = S7control.getinstance().ReadWord("DB100.6", 1);
      //判断进片请求 
       List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
       List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
      if(datas1List!=null &&datas1ListState!=null){
          //获取prc进片请求数据
       boolean exist = datas1List.contains((short)1); 
       //获取进片车状态
       boolean exist1 = datas1ListState.contains((short)0); 
      //进片请求为1时
       if(exist=true){
        //当进片车空闲时
        if(exist1=true){
        //获取进片id
        List<Short> datas1ListID=S7control.getinstance().ReadWord("DB106.26", 13);
        //获取玻璃id    
        for(Short list1:datas1ListID){
            spianService.selectAll((short)list1);
        }
      }

     
        
        
        //System.out.println(exist);
      }
    }
            
          

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