From 33434cc72b423afa36f6bfaa6ff07919336d8978 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 22 八月 2025 15:18:45 +0800
Subject: [PATCH] 1、websocket更新
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 173 ++++++++++++++++-----------------------------------------
1 files changed, 50 insertions(+), 123 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 8f5b662..3154bf8 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
@@ -18,7 +18,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
-import com.mes.tools.WebSocketServer;
+import com.mes.tools.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,7 +29,6 @@
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;
@@ -57,10 +56,8 @@
@Resource
LargenScreenService largenScreenService;
-
- private static final String EDG_STORAGE_DEVICE_ONE_TASK = "edg_storage_device_one_task";
-
- private static final String EDG_STORAGE_DEVICE_TWO_TASK = "edg_storage_device_two_task";
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Scheduled(fixedDelay = 1000)
public void CacheGlassOneTasks() {
@@ -84,22 +81,7 @@
.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");
- }
- }
- }
+ webSocketUtils.sendToWeb(webSocketName, jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -114,21 +96,7 @@
public void currentCutDrawingTaskChild(String webSocketName, int deviceId, int stationCell) {
JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
- 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");
- }
- }
- }
+ webSocketUtils.sendToWeb(webSocketName, jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -137,103 +105,62 @@
//纾ㄨ竟淇℃伅
List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo();
jsonObject.append("edgTasks", edgTasks);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("edgTasks");
- 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("edgTasks is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("edgTasks", jsonObject);
}
@Scheduled(fixedDelay = 5000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- 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());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("largenScreenProduction is closed");
- }
- }
- }
+ List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
+ jsonObject.append("productionVO", productionVO);
+ webSocketUtils.sendToWeb("largenScreenProduction", jsonObject);
+
}
@Scheduled(fixedDelay = 5000)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
+ Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
+ 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)
+ .between(EdgGlassTaskInfo::getCreateTime, start, end)
+ );
+ edgOneCount = edgOneCount >= 6 ? 6 : edgOneCount;
+ int edgTwoCount = edgGlassTaskInfoService.count(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 2)
+ .between(EdgGlassTaskInfo::getCreateTime, start, end)
+ );
+ 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)
+ .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(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ jsonObject.append("loadRunTimes", loadRunTimes);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
- if (sendwServer != null) {
- Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
- 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)
- .between(EdgGlassTaskInfo::getCreateTime, start, end)
- );
- edgOneCount = edgOneCount >= 6 ? 6 : edgOneCount;
- int edgTwoCount = edgGlassTaskInfoService.count(
- new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .lt(EdgGlassTaskInfo::getState, 2)
- .eq(EdgGlassTaskInfo::getLine, 2)
- .between(EdgGlassTaskInfo::getCreateTime, start, end)
- );
- 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)
- .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(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- jsonObject.append("loadRunTimes", loadRunTimes);
- 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");
- }
- }
- }
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
+
}
}
--
Gitblit v1.8.0