From 83f738105416c9b11e3b7c5246a0980e41b6650e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 13 十月 2025 16:59:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index b7e9966..9d23890 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -16,6 +16,7 @@
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
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;
@@ -42,6 +43,9 @@
@Resource
private OrdersService ordersService;
+ @Resource
+ private WebSocketUtils webSocketUtils;
+
@Scheduled(fixedDelay = 2000)
public void sendRawGlassMessage() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
@@ -51,12 +55,7 @@
List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
jsonObject.append("rawStationDetailsList", rawStationDetailsList);
jsonObject.append("tasks", tasks);
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- sendwServer.stream().forEach(e -> {
- e.sendMessage(String.valueOf(jsonObject));
- });
- }
+ webSocketUtils.sendToWeb("rawGlass", jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -74,12 +73,6 @@
List<OrderDTO> orderDTOS = ordersService.selectOrderPercent();
jsonObject.append("orderDTOS", orderDTOS);
-
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- sendwServer.stream().forEach(e -> {
- e.sendMessage(String.valueOf(jsonObject));
- });
- }
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
}
}
--
Gitblit v1.8.0