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/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java | 40 ++++++----------------------------------
1 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
index 30b3a63..afdff47 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcSlicecage.java
@@ -8,7 +8,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
-import com.mes.tools.WebSocketServer;
+import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +36,9 @@
private RedisUtil redisUtil;
@Autowired
private GlassInfoService glassInfoService;
+
+ @Resource
+ private WebSocketUtils webSocketUtils;
// @Value("${mes.scan.ip}")
// private String scanIp;
@@ -119,29 +122,7 @@
queryDataSource1();
//鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
queryDataSource2();
- try {
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
- 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");
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
- System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
- // TODO: handle exception
- }
-
-
+ webSocketUtils.sendToWeb("slicecage", jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
@@ -156,16 +137,7 @@
//鍑虹墖浠诲姟鏁版嵁
List<BigStorageCageDetails> bigStorageCageDetailsOutTask = bigStorageCageDetailsService.selectOutTask();
jsonObject.append("bigStorageCageDetailsOutTask", bigStorageCageDetailsOutTask);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("Home is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("isRun", jsonObject);
}
// @Scheduled(fixedDelay = Long.MAX_VALUE)
--
Gitblit v1.8.0