From 689b64bfce7ea0eff18349b996994366568a30b3 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期一, 05 八月 2024 13:33:05 +0800 Subject: [PATCH] 下片页面添加落架详情显示 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 90 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 71 insertions(+), 19 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java index 308599c..adf8d51 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java @@ -1,68 +1,120 @@ package com.mes.job; import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.mes.downglassinfo.entity.DownGlassInfo; +import com.mes.downglassinfo.service.DownGlassInfoService; +import com.mes.downstorage.service.DownStorageCageService; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.tools.WebSocketServer; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Component public class Downpush { - @Autowired private DownWorkstationService downWorkstationService; - @Scheduled(fixedDelay = 1000) - public void Downpush() { + @Autowired + private DownStorageCageService downStorageCageService; + @Autowired + private DownGlassInfoService downGlassInfoService; - + @Scheduled(fixedDelay = 2000) + public void sendDownWorkstations() { + log.info("鍙戦�佸伐浣嶇幓鐠冧俊鎭�"); JSONObject jsonObject = new JSONObject(); - JSONObject jsonObject2 = new JSONObject(); - JSONObject jsonObject3 = new JSONObject(); - List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6); - List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3); - List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6); - jsonObject.append("params",data); - jsonObject2.append("glassinfo",glassinfodata); - jsonObject3.append("glassinfo2",glassinfodata2); + List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6); + jsonObject.append("params", data); log.info(jsonObject.toString()); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass"); - ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2"); - ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3"); - // log.info(sendwServer.toString()); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { - if (webserver != null&&webserver.session.isOpen()) { + log.info("宸插彂閫�"); webserver.sendMessage(jsonObject.toString()); } } } + } + + @Scheduled(fixedDelay = 1000) + public void sendGlassInfoData() { + log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅1"); + JSONObject jsonObject2 = new JSONObject(); + List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3); + jsonObject2.append("glassinfo",glassinfodata); + log.info(jsonObject2.toString()); + ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2"); if (sendwServer2 != null) { for (WebSocketServer webserver : sendwServer2) { - if (webserver != null&&webserver.session.isOpen()) { webserver.sendMessage(jsonObject2.toString()); } } } + } + + @Scheduled(fixedDelay = 1000) + public void sendGlassInfoData2() { + log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅2"); + JSONObject jsonObject3 = new JSONObject(); + List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6); + jsonObject3.append("glassinfo2",glassinfodata2); + log.info(jsonObject3.toString()); + ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3"); if (sendwServer3 != null) { for (WebSocketServer webserver : sendwServer3) { - if (webserver != null&&webserver.session.isOpen()) { webserver.sendMessage(jsonObject3.toString()); } } } + } + @Scheduled(fixedDelay = 2000) + public void sendDownStorageCages() { + log.info("鍙戦�佺紦瀛樼幓鐠冧俊鎭�"); + JSONObject jsonObject4 = new JSONObject(); + List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages(); + jsonObject4.append("params2",list); + log.info(jsonObject4.toString()); + ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache"); + if (sendwServer4 != null) { + for (WebSocketServer webserver : sendwServer4) { + if (webserver != null && webserver.session.isOpen()) { + webserver.sendMessage(jsonObject4.toString()); + } + } + } + } + + @Scheduled(fixedDelay = 2000) + public void sendDownGlassInfo() { + log.info("鍙戦�佸綋鍓嶆鍦ㄦ墽琛屽伐绋嬪凡钀芥灦鐨勭幓鐠冧俊鎭�"); + List<DownGlassInfo> downGlassInfos = downGlassInfoService.list(new LambdaQueryWrapper<DownGlassInfo>() + .inSql(DownGlassInfo::getEngineerId, "select engineer_id from engineering where state = 1")); + Map<Integer, List<DownGlassInfo>> listMap = downGlassInfos.stream().collect(Collectors.groupingBy(DownGlassInfo::getWorkStationId)); + JSONObject jsonObject4 = new JSONObject(); + List<Map<String, Object>> list = downStorageCageService.selectDownStorageCages(); + jsonObject4.append("sendDownGlass", listMap); + ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("unloadglass"); + if (sendwServer4 != null) { + for (WebSocketServer webserver : sendwServer4) { + if (webserver != null && webserver.session.isOpen()) { + webserver.sendMessage(jsonObject4.toString()); + } + } + } } } -- Gitblit v1.8.0