From 91c0155937f3177c41cfd91636d5094454fff855 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 三月 2025 17:19:14 +0800
Subject: [PATCH] 添加上片历史任务接口
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 bb5663f..ca32684 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
@@ -5,13 +5,13 @@
import com.mes.common.config.Const;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
-import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
-import com.mes.opctask.entity.EdgStorageDeviceTask;
+import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
@@ -23,8 +23,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletionStage;
/**
* @Author : zhoush
@@ -47,6 +45,8 @@
EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
@Resource
EngineeringService engineeringService;
+ @Resource
+ LargenScreenService largenScreenService;
private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task";
@@ -104,10 +104,7 @@
}
public void currentCutDrawingTaskChild(String webSocketName, int deviceId, int stationCell) {
- JSONObject jsonObject = new JSONObject();
- List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
- jsonObject.append("currentCutTerritory", currentCutDrawings);
-
+ JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -149,6 +146,29 @@
}
}
+ @Scheduled(fixedDelay = 30000)
+ public void querySameDayProductionTask() {
+ JSONObject jsonObject = new JSONObject();
+ DailyProductionVO productionVO = largenScreenService.querySameDayProduction(null);
+ jsonObject.append("productionVO", productionVO);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("largenScreenProduction is closed");
+ }
+ }
+ }
+ }
+
@Scheduled(fixedDelay = 1000)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.8.0