From 21a76af55c4da5f1999e9dd24690b2449a7a18a7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 05 六月 2025 14:19:41 +0800
Subject: [PATCH] 磨边模块大屏代码迁移
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 334cfba..51570dd 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -24,8 +24,11 @@
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;
@@ -174,7 +177,7 @@
}
}
- @Scheduled(fixedDelay = 500)
+ @Scheduled(fixedDelay = 5000)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
@@ -182,21 +185,27 @@
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
-
- List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
+ 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)
- .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ .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)
- .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ .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)
@@ -211,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) {
--
Gitblit v1.8.0