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 | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 ae005d6..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
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.config.Const;
+import com.mes.order.entity.dto.OrderDTO;
+import com.mes.order.service.OrdersService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
@@ -14,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;
@@ -37,6 +40,12 @@
@Resource
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Resource
+ private OrdersService ordersService;
+
+ @Resource
+ private WebSocketUtils webSocketUtils;
+
@Scheduled(fixedDelay = 2000)
public void sendRawGlassMessage() {
log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
@@ -46,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)
@@ -66,11 +70,9 @@
.orderByAsc(RawGlassStorageStation::getSlot);
List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
jsonObject.append("rawGlassStorageDetailList", rawGlassStorageDetailList);
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- sendwServer.stream().forEach(e -> {
- e.sendMessage(String.valueOf(jsonObject));
- });
- }
+
+ List<OrderDTO> orderDTOS = ordersService.selectOrderPercent();
+ jsonObject.append("orderDTOS", orderDTOS);
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
}
}
--
Gitblit v1.8.0