From b64ef67b6950301c5e808cbb709248e341a3e6a2 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 20 十二月 2024 22:53:14 +0800 Subject: [PATCH] 1、大理片笼及中空大理片笼自动报工,增加过渡台限制(高度超过2500或者厚度超过12) 2、卧理报工 --- hangzhoumesParent/moduleService/howllowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 e5c23e5..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 @@ -33,23 +33,26 @@ @Resource HollowGlassOutRelationInfoService hollowGlassOutRelationInfoService; @Scheduled(fixedDelay = 1000) - public void CacheGlassTasks() { + 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("HollowGlass",listMap); + 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