From 6485c1ffa31a8723945f873525beed331efeab08 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 三月 2025 09:27:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index ead39b0..bb5663f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -160,21 +160,23 @@
);
List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
);
jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgOneTasks", edgTwoTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
List<Engineering> engineeringOne = engineeringService.list(
new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getStationCell, 5)
+ .eq(Engineering::getState, 0)
);
List<Engineering> engineeringTow = engineeringService.list(
new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getStationCell, 6)
+ .eq(Engineering::getState, 0)
);
jsonObject.append("engineeringOne", engineeringOne);
- jsonObject.append("engineeringTow", engineeringTow);
+ jsonObject.append("engineeringTwo", engineeringTow);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0