From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 0c1e86a..e7a4565 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
@@ -13,6 +13,7 @@
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -151,11 +152,10 @@
@Scheduled(fixedDelay = 1000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
- jsonObject.append("productionVO", productionVO);
-
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
if (sendwServer != null) {
+ List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
+ jsonObject.append("productionVO", productionVO);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
@@ -171,38 +171,41 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 500)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
- List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
- new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .lt(EdgGlassTaskInfo::getState, 2)
- .eq(EdgGlassTaskInfo::getLine, 1)
- );
- List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
- new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .lt(EdgGlassTaskInfo::getState, 2)
- .eq(EdgGlassTaskInfo::getLine, 2)
- );
- jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgTwoTasks", edgTwoTasks);
- List<Engineering> engineeringOne = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 5)
- .eq(Engineering::getState, 0)
- );
- List<Engineering> engineeringTow = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 6)
- .eq(Engineering::getState, 0)
- );
- jsonObject.append("engineeringOne", engineeringOne);
- jsonObject.append("engineeringTwo", engineeringTow);
- List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
- jsonObject.append("pieChartVOS", pieChartVOS);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
+ List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 1)
+ );
+ List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 2)
+ );
+ jsonObject.append("edgOneTasks", edgOneTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
+ List<Engineering> engineeringOne = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 5)
+ .eq(Engineering::getState, 0)
+ );
+ List<Engineering> engineeringTow = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 6)
+ .eq(Engineering::getState, 0)
+ );
+ jsonObject.append("engineeringOne", engineeringOne);
+ jsonObject.append("engineeringTwo", engineeringTow);
+ List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
+ jsonObject.append("loadRunTimes", loadRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0