hangzhoumesParent/JsonFile/PlcdownGlass.json
File was deleted hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
@@ -1,5 +1,6 @@ package com.mes.edgglasstask.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import lombok.EqualsAndHashCode; @@ -36,4 +37,7 @@ private Date time; @TableLogic private int deleted; } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
@@ -19,4 +19,10 @@ List<EdgGlassTaskInfo> selectEdgInfo(); String setEdgGlassInfoRequest(EdgGlassInfoRequest request); /** * 查询判断磨边线是否有玻璃运行 * @param * @return */ List<EdgGlassTaskInfo> selectTaskCacheIsRun(); } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -2,6 +2,7 @@ import cn.smallbun.screw.core.util.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.utils.RedisUtil; import com.mes.edgglasstask.entity.EdgGlassTaskInfo; @@ -50,4 +51,18 @@ } return "success"; } /** * 查询判断磨边线是否有玻璃运行 * @param * @return */ @Override public List<EdgGlassTaskInfo> selectTaskCacheIsRun() { QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>() .select("line") .eq("status", 1) .groupBy("line"); return this.list(wrapper); } } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -146,23 +146,6 @@ log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime()); } @Scheduled(fixedDelay = 1000) public void temperingIsRun() { JSONObject jsonObject = new JSONObject(); //正在进行的任务 List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun(); jsonObject.append("taskCaches", taskCaches); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { if (webserver != null) { webserver.sendMessage(jsonObject.toString()); } else { log.info("Home is closed"); } } } } @Scheduled(fixedDelay = 1000) public void dealDamageTask() { @@ -782,7 +765,7 @@ public void cacheGlassIsRun() { JSONObject jsonObject = new JSONObject(); //正在进行的任务 List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun(); List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun(); jsonObject.append("taskCaches", taskCaches); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun"); if (sendwServer != null) { hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -73,11 +73,6 @@ * @return */ TaskCache selectLastOutCacheInfo(int line); /** * 查询判断磨边线是否有玻璃运行 * @param * @return */ List<TaskCache> selectTaskCacheIsRun(); } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -180,23 +180,7 @@ return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime)); } /** * 查询判断磨边线是否有玻璃运行 * * @param * @return */ @Override public List<TaskCache> selectTaskCacheIsRun() { List<TaskCache> taskCaches = null; taskCaches = taskCacheMapper.selectJoinList(TaskCache.class, new MPJLambdaWrapper<TaskCache>() .select("top 4 t.end_cell,ISNULL(b.glass_id, 0)as glass_id") .leftJoin("big_storage_cage_feed_task as b on t.glass_id=b.glass_id ") .groupBy("t.end_cell,b.glass_id,t.create_time") .orderByDesc("t.create_time") ); return taskCaches; } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
File was deleted
