hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -672,6 +672,7 @@ 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) { @@ -700,8 +701,10 @@ 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()); hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -20,23 +20,13 @@ boolean insertTaskCache(TaskCache taskCache); /** * 查询磨边任务 * * @param line * @return */ List<Map<String,Object>> selectEdgInfo(String line); /** * 查询磨边任务 * * @param line * @return */ TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes); /** * 查询理片任务 * * @return */ List<TaskCache> selectCacheInfo(); hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -17,6 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * <p> @@ -59,6 +60,7 @@ .orderByAsc(TaskCache::getCreateTime)); List<Map<String,Object>> result=new ArrayList<>(); int serialNumber=1; List<Map<String,Object>> a=taskCache.stream().filter(t->t.getTaskStatus()==1).collect(Collectors.toList()); for(TaskCache taskCache1:taskCache){ Map<String,Object> map=new HashMap<>(); GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
