From 17d23216d139c20ba4615bcd7731776520e5b5dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 九月 2025 16:01:36 +0800
Subject: [PATCH] 1、这块代码取消注释，添加破损查询条件
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 6dee99b..a6c8bbf 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -27,6 +27,7 @@
import com.mes.s7.entity.S7DataZKDLPTwo;
import com.mes.s7.entity.S7DataZKExtra;
import com.mes.tools.WebSocketServer;
+import com.mes.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -91,6 +92,8 @@
ModbusTcp CMJ2ModbusTcp;
private Integer offset = 40001;
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Resource
RedisUtil redisUtil;
@@ -128,15 +131,7 @@
} catch (Exception e) {
log.error("opc瀛樺湪寮傚父", e);
}
-
- List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get(websocketName);
- if (CollectionUtil.isNotEmpty(sendwServer)) {
- for (WebSocketServer socketServer : sendwServer) {
- if (socketServer != null && socketServer.session.isOpen()) {
- socketServer.sendMessage(jsonObject.toString());
- }
- }
- }
+ webSocketUtils.sendToWeb(websocketName,jsonObject);
}
@Scheduled(fixedDelay = 1000)
@@ -145,22 +140,7 @@
try {
//鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
queryDataSource1(jsonObject);
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("hollowGlassMessage");
- 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("hollowGlassMessage",jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
@@ -336,9 +316,9 @@
if (redisUtil.getCacheObject("priorityHollowSwitch") == null) {
redisUtil.setCacheObject("priorityHollowSwitch", false);
} else {
- dispatchHollowSwitch = redisUtil.getCacheObject("priorityHollowSwitch");
+ priorityHollowSwitch = redisUtil.getCacheObject("priorityHollowSwitch");
}
- jsonObject.append("dispatchHollowSwitch", dispatchHollowSwitch);
+ jsonObject.append("priorityHollowSwitch", priorityHollowSwitch);
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
@@ -361,20 +341,6 @@
jsonObject.append("pieChartVOS", pieChartVOS);
List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("hollowRunTimes", hollowRunTimes);
- 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");
- }
- }
- }
+ webSocketUtils.sendToWeb("largenScreen",jsonObject);
}
}
--
Gitblit v1.8.0