ZengTao
2025-05-26 fcb8b8cc392b146aa11bbaab9e497f7f13f29d44
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -24,7 +24,13 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -178,18 +184,28 @@
        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
        if (sendwServer != null) {
            List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
            Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            String formatted = sdf.format(startOfToday);
            LocalDate date = LocalDate.parse(formatted); // formatted = "2025-05-23"
            LocalDateTime start = date.atStartOfDay(); // 2025-05-23 00:00:00
            LocalDateTime end = date.plusDays(1).atStartOfDay();
            int edgOneCount = edgGlassTaskInfoService.count(
                    new LambdaQueryWrapper<EdgGlassTaskInfo>()
                            .lt(EdgGlassTaskInfo::getState, 2)
                            .eq(EdgGlassTaskInfo::getLine, 1)
                            .between(EdgGlassTaskInfo::getCreateTime, start, end)
            );
            List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
            edgOneCount = edgOneCount >= 6 ? 6 : edgOneCount;
            int edgTwoCount = edgGlassTaskInfoService.count(
                    new LambdaQueryWrapper<EdgGlassTaskInfo>()
                            .lt(EdgGlassTaskInfo::getState, 2)
                            .eq(EdgGlassTaskInfo::getLine, 2)
                            .between(EdgGlassTaskInfo::getCreateTime, start, end)
            );
            jsonObject.append("edgOneTasks", edgOneTasks);
            jsonObject.append("edgTwoTasks", edgTwoTasks);
            edgTwoCount = edgTwoCount >= 6 ? 6 : edgTwoCount;
            jsonObject.append("edgOneCount", edgOneCount);
            jsonObject.append("edgTwoCount", edgTwoCount);
            List<Engineering> engineeringOne = engineeringService.list(
                    new LambdaQueryWrapper<Engineering>()
                            .eq(Engineering::getStationCell, 5)
@@ -204,7 +220,7 @@
            jsonObject.append("engineeringTwo", engineeringTow);
            List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
            jsonObject.append("pieChartVOS", pieChartVOS);
            List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
            List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
            jsonObject.append("loadRunTimes", loadRunTimes);
            for (WebSocketServer webserver : sendwServer) {
                if (webserver != null) {