From 3bfff554301500a434052a695380838942956317 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 19 九月 2025 18:02:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 55 ++++++++++++++-----------------------------------------
1 files changed, 14 insertions(+), 41 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 ba1d20e..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
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
-import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
@@ -28,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;
@@ -92,6 +92,8 @@
ModbusTcp CMJ2ModbusTcp;
private Integer offset = 40001;
+ @Resource
+ private WebSocketUtils webSocketUtils;
@Resource
RedisUtil redisUtil;
@@ -129,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)
@@ -146,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();
}
@@ -332,6 +311,14 @@
dispatchHollowSwitch = redisUtil.getCacheObject("dispatchHollowSwitch");
}
jsonObject.append("dispatchHollowSwitch", dispatchHollowSwitch);
+ //璋冨害寮�鍏�
+ boolean priorityHollowSwitch = false;
+ if (redisUtil.getCacheObject("priorityHollowSwitch") == null) {
+ redisUtil.setCacheObject("priorityHollowSwitch", false);
+ } else {
+ priorityHollowSwitch = redisUtil.getCacheObject("priorityHollowSwitch");
+ }
+ jsonObject.append("priorityHollowSwitch", priorityHollowSwitch);
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
@@ -354,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