From c11313e87c3bbbdb3910ebf1e5ee7b153e527f40 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:13:59 +0800
Subject: [PATCH] 1、卧式理片笼漏提代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 ca32684..0c1e86a 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
@@ -11,6 +11,8 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.DateRequest;
+import com.mes.largenscreen.entity.PieChartVO;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -146,10 +148,10 @@
}
}
- @Scheduled(fixedDelay = 30000)
+ @Scheduled(fixedDelay = 1000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- DailyProductionVO productionVO = largenScreenService.querySameDayProduction(null);
+ List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
jsonObject.append("productionVO", productionVO);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
@@ -173,15 +175,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);
@@ -197,6 +199,8 @@
);
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) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0