ZengTao
2025-04-01 a52b87449e493d4312cc81c33a4169eb6be3c144
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -174,15 +174,15 @@
    public void largenScreen() {
        JSONObject jsonObject = new JSONObject();
        //磨边信息
        List<EdgStorageDeviceTaskHistory> edgOneTasks = edgStorageDeviceTaskHistoryService.list(
                new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
                        .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
                        .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
        List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
                new LambdaQueryWrapper<EdgGlassTaskInfo>()
                        .lt(EdgGlassTaskInfo::getState, 2)
                        .eq(EdgGlassTaskInfo::getLine, 1)
        );
        List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
                new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
                        .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
                        .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
        List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
                new LambdaQueryWrapper<EdgGlassTaskInfo>()
                        .lt(EdgGlassTaskInfo::getState, 2)
                        .eq(EdgGlassTaskInfo::getLine, 2)
        );
        jsonObject.append("edgOneTasks", edgOneTasks);
        jsonObject.append("edgTwoTasks", edgTwoTasks);