From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务，占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务
---
hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 53f3631..c745481 100644
--- a/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -36,22 +36,23 @@
public void hollowGlassTask() {
List<HollowGlassOutRelationInfo> taskList = hollowGlassOutRelationInfoService.list(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
.in(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START, Const.HOLLOW_FLOW_CARD_PAUSE));
- if (CollectionUtil.isEmpty(taskList)){
+ if (CollectionUtil.isEmpty(taskList)) {
return;
}
JSONObject jsonObject = new JSONObject();
List<String> flowCardIdList = taskList.stream().map(HollowGlassOutRelationInfo::getFlowCardId).collect(Collectors.toList());
List<HollowGlassQueueInfo> list = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>().in(HollowGlassQueueInfo::getFlowCardId, flowCardIdList));
Map<Integer, List<HollowGlassQueueInfo>> listMap = list.stream().collect(Collectors.groupingBy(HollowGlassQueueInfo::getCell));
- jsonObject.append("930",listMap.get("930"));
- jsonObject.append("931",listMap.get("931"));
- jsonObject.append("932",listMap.get("932"));
+ jsonObject.append("930", listMap.get(930));
+ jsonObject.append("931", listMap.get(931));
+ jsonObject.append("932", listMap.get(932));
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
if (CollectionUtil.isNotEmpty(sendwServer)) {
- WebSocketServer socketServer = sendwServer.get(0);
+ for (WebSocketServer socketServer : sendwServer) {
if (socketServer != null && socketServer.session.isOpen()) {
socketServer.sendMessage(jsonObject.toString());
}
+ }
}
}
}
--
Gitblit v1.8.0