From bfd8d1698372fbedd96b1badfa68c9d3649c2fa9 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期五, 14 六月 2024 11:28:58 +0800 Subject: [PATCH] 拉取最新代码 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 91 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java index 913738d..c6e8a18 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java @@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.query.MPJQueryWrapper; @@ -30,6 +31,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @Author : zhoush @@ -629,5 +631,94 @@ return edgGlassTaskInfoService.save(edgGlassTaskInfo); } + /** + * 褰撳墠鍒囧壊鐗堝浘淇℃伅 + * + * @param + * @return + */ + @Scheduled(fixedDelay = 1000) + public void currentCutTerritory(){ + JSONObject jsonObject = new JSONObject(); + List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory(); + jsonObject.append("currentCutTerritory", currentCutTerritorys); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass"); + 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"); + } + } + } + } + + /** + * 纾ㄨ竟浠诲姟 + * + * @param + * @return + */ + @Scheduled(fixedDelay = 1000) + public void selectEdgTask(){ + JSONObject jsonObject = new JSONObject(); + List<Map<String,Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001"); + List<Map<String,Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002"); + jsonObject.append("EdgTasks1", EdgTasks1); + jsonObject.append("EdgTasks2", EdgTasks2); + log.info("纾ㄨ竟浠诲姟{}",jsonObject); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass"); + 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"); + } + } + } + } + + /** + * 纾ㄨ竟鍓� 缂撳瓨鍐呬俊鎭� + * + * @param + * @return + */ + @Scheduled(fixedDelay = 1000) + public void selectEdgStorageCage(){ + JSONObject jsonObject = new JSONObject(); + List<Map<String, Object>> EdgStorageCageinfos=edgStorageCageService.selectEdgStorageCages(); + jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos); + log.info("绗煎唴淇℃伅{}",EdgStorageCageinfos); + ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass"); + 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"); + } + } + } + } + } -- Gitblit v1.8.0