From 91320a3e9679c8e7ff73720750e87ced2e29a136 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 26 二月 2025 15:08:19 +0800
Subject: [PATCH] 修改部分大屏后端数据格式
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 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 c603a6e..4628ee2 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
@@ -9,6 +9,8 @@
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.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -22,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CompletionStage;
/**
* @Author : zhoush
@@ -42,6 +45,8 @@
EdgStorageDeviceTaskService edgStorageDeviceTaskService;
@Resource
EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
+ @Resource
+ EngineeringService engineeringService;
private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task";
@@ -50,28 +55,58 @@
@Scheduled(fixedDelay = 1000)
public void CacheGlassOneTasks() {
- CacheGlassTasksChild(EDG_STORAGE_DEVICE_ONE_TASK, "cacheGlassOne", 1, 5);
+ CacheGlassTasksChild("cacheGlassOne", 1);
}
@Scheduled(fixedDelay = 1000)
public void CacheGlassTwoTasks() {
- CacheGlassTasksChild(EDG_STORAGE_DEVICE_TWO_TASK, "cacheGlassTwo", 2, 6);
+ CacheGlassTasksChild("cacheGlassTwo", 2);
}
- private void CacheGlassTasksChild(String tableName, String webSocketName, int deviceId, int stationCell) {
+ private void CacheGlassTasksChild(String webSocketName, int deviceId) {
JSONObject jsonObject = new JSONObject();
- List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
- jsonObject.append("currentCutTerritory", currentCutDrawings);
//鍗у缂撳瓨绗煎唴淇℃伅
List<EdgStorageCageVO> edgStorageCageVOS = edgStorageCageService.selectEdgStorageCagesByDeviceId(deviceId);
jsonObject.append("EdgStorageCageinfos", edgStorageCageVOS);
//鑾峰彇姝ｅ湪鏁村舰涓殑浠诲姟
EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId,deviceId)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
.orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
jsonObject.append("taskMessage", taskHistory);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
+ 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("Home is closed");
+ }
+ }
+ }
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void currentCutDrawingOneTask() {
+ currentCutDrawingTaskChild("currentCutDrawingOne", 1, 5);
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void currentCutDrawingTwoTask() {
+ currentCutDrawingTaskChild("currentCutDrawingTwo", 2, 6);
+ }
+
+ public void currentCutDrawingTaskChild(String webSocketName, int deviceId, int stationCell) {
+ JSONObject jsonObject = new JSONObject();
+ List<CutDrawingVO> currentCutDrawings = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ jsonObject.append("currentCutTerritory", currentCutDrawings);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(webSocketName);
if (sendwServer != null) {
@@ -113,4 +148,47 @@
}
}
}
+
+ @Scheduled(fixedDelay = 1000)
+ 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<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
+ new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
+ );
+ jsonObject.append("edgOneTasks", edgOneTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
+ List<Engineering> engineeringOne = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 5)
+ );
+ List<Engineering> engineeringTow = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 6)
+ );
+ jsonObject.append("engineeringOne", engineeringOne);
+ jsonObject.append("engineeringTow", engineeringTow);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
+ 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("largenScreen is closed");
+ }
+ }
+ }
+ }
}
--
Gitblit v1.8.0