严智鑫
2024-10-12 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
import com.mes.md.mapper.MachineMapper;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -25,16 +27,19 @@
    PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
    @Autowired
    TaskingService taskingService;
    @Scheduled(fixedDelay = 500)
    @Autowired
    MachineMapper machineMapper;
    //@Scheduled(fixedDelay = 500)
    public void PLCEdging() {
        //磨边进片请求信号
        String edgingSign = plcParameterObject.getPlcParameter("edgingSign").getValue();
        if (!Objects.equals(edgingSign, "")){
            Tasking glass = new Tasking();
            glass.setWorkState("工作");
            glass.setCurrentCraft("磨边");
            //glass.setCurrentCraft("磨边");
            glass.setState("线上");
            Tasking tasking =taskingService.selectTasking(glass);
            Tasking tasking =new Tasking();
            //Tasking tasking =taskingService.selectTasking(glass);
            //发送长宽厚尺寸
            S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("length").getAddress(), Integer.parseInt(tasking.getLength().toString()));
            S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("width").getAddress(), Integer.parseInt(tasking.getWidth().toString()));
@@ -52,13 +57,21 @@
    public void edgingWeb() {
        //获取当前任务表最新的一块任务状态
        //获取报警状态
        String warning = plcParameterObject.getPlcParameter("warning").getValue();
        JSONObject jsonObject = new JSONObject();
        if (!Objects.equals(warning, "0")) {
            //log.info("报警信息:"+warning);
            jsonObject.append("warning", warning);
        }
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanQrCode");
//        String warning = plcParameterObject.getPlcParameter("warning").getValue();
//        if (!Objects.equals(warning, "0")) {
//            //log.info("报警信息:"+warning);
//            jsonObject.append("warning", warning);
//        }
        Machine machine=machineMapper.selectById(5L);
        List<Tasking> taskingList=taskingService.findMachineTask(machine);
        jsonObject.append("taskingList", taskingList);
        jsonObject.append("machine", machine);
        Machine machineQr=machineMapper.selectById(3L);
        List<Tasking> taskingListQr=taskingService.findMachineTask(machineQr);
        jsonObject.append("taskingListQr",taskingListQr );
        jsonObject.append("machineQR",machineQr );
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("edging");
        if (sendwServer != null) {
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {