大理片任务获取添加非空判断

ZengTao

2025-07-07 a647092c6deccf7caf64a0cdf897861694a8a9c7

大理片任务获取添加非空判断

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java

@@ -25,6 +25,7 @@
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
@@ -85,22 +86,16 @@
        try {
            //进片任务数据
            List<BigStorageTaskVO> inTaskList = new ArrayList();
//            ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
            String fromOpcUa = s7DataDLPOne.getFrom1().toString();
            List<Integer> states = s7DataDLPOne.getStates();
            List<Integer> tos = s7DataDLPOne.getTos();
            List<String> ids = s7DataDLPOne.getIds();
            for (int i = 1; i <= 6; i++) {
//                ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
//                ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
//                ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
                String requestWord = ids.get(i - 1);
                String targetSlotWord = tos.get(i - 1).toString();
                String stateWord = states.get(i - 1).toString();
//                if (null != requestWord.getValue()) {
                if (null != requestWord) {
                if (StringUtils.isNotEmpty(requestWord)) {
                    BigStorageTaskVO task = new BigStorageTaskVO();
//                    task.setGlassId(requestWord.getValue() + "");
                    task.setGlassId(requestWord);
                    int isExistCount = bigStorageCageDetailsService.count(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, task.getGlassId())
                            .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
@@ -109,9 +104,6 @@
                    } else {
                        task.setIsSame(0);
                    }
//                    task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
//                    task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
//                    task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
                    task.setStartSlot(Integer.parseInt(fromOpcUa));
                    task.setTargetSlot(Integer.parseInt(targetSlotWord));
                    task.setTaskState(Integer.parseInt(stateWord));
@@ -125,34 +117,23 @@
        }
        try {
            //进片联机
//            ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
//            jsonObject.append("inkageEntity", inkageEntity.getValue());
            Boolean inkageEntity = s7DataDLPOne.getMesControl();
            jsonObject.append("inkageEntity", inkageEntity);
            //进片请求
//            ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
//            jsonObject.append("requestEntity", requestEntity.getValue());
            String requestEntity = s7DataDLPOne.getRequestMes().toString();
            jsonObject.append("requestEntity", requestEntity);
            //启动命令
//            ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
//            jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
            String mesReplyEntity = s7DataDLPOne.getMesReply().toString();
            jsonObject.append("mesReplyEntity", mesReplyEntity);
            //出片联机
//            ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
//            jsonObject.append("outInkageEntity", outInkageEntity.getValue());
            Boolean outInkageEntity = s7DataWLTwo.getMesControl();
            jsonObject.append("outInkageEntity", outInkageEntity);
            //出片请求
//            ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
//            jsonObject.append("outRequestEntity", outRequestEntity.getValue());
            String outRequestEntity = s7DataWLTwo.getRequestMes().toString();
            jsonObject.append("outRequestEntity", outRequestEntity);


            //出片任务数据
//            List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
            List<BigStorageCageTask> outTaskList = new ArrayList<>();
            for (int i = 0; i < 6; i++) {

@@ -200,11 +181,13 @@
                        taskState = s7DataWLTwo.getState6();
                        break;
                }
                bigStorageCageTask.setGlassId(glassId);
                bigStorageCageTask.setStartSlot(startSlot);
                bigStorageCageTask.setTargetSlot(targetSlot);
                bigStorageCageTask.setTaskState(taskState);
                outTaskList.add(bigStorageCageTask);
                if (StringUtils.isNotEmpty(glassId)) {
                    bigStorageCageTask.setGlassId(glassId);
                    bigStorageCageTask.setStartSlot(startSlot);
                    bigStorageCageTask.setTargetSlot(targetSlot);
                    bigStorageCageTask.setTaskState(taskState);
                    outTaskList.add(bigStorageCageTask);
                }
            }
            jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
        } catch (Exception e) {

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java

@@ -30,6 +30,7 @@
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
@@ -218,7 +219,7 @@
                        targetSlotWord = s7DataZKDLPOne.getTo6().toString();
                        break;
                }
                if (null != requestWord) {
                if (StringUtils.isNotEmpty(requestWord)) {
                    BigStorageTaskVO task = new BigStorageTaskVO();
                    task.setGlassId(requestWord);
                    int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
@@ -313,11 +314,13 @@
                    taskState = s7DataZKDLPTwo.getState6();
                    break;
            }
            bigStorageCageTask.setGlassId(glassId);
            bigStorageCageTask.setStartSlot(startSlot);
            bigStorageCageTask.setTargetSlot(targetSlot);
            bigStorageCageTask.setTaskState(taskState);
            outTaskList.add(bigStorageCageTask);
            if (StringUtils.isNotEmpty(glassId)) {
                bigStorageCageTask.setGlassId(glassId);
                bigStorageCageTask.setStartSlot(startSlot);
                bigStorageCageTask.setTargetSlot(targetSlot);
                bigStorageCageTask.setTaskState(taskState);
                outTaskList.add(bigStorageCageTask);
            }
        }
        jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);