义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
zhoushihao
2024-08-08 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java


@@ -6,10 +6,13 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;


import com.github.yulichang.query.MPJQueryWrapper;


import com.github.yulichang.wrapper.MPJLambdaWrapper;


import com.mes.common.S7object;


import com.mes.common.config.Const;


import com.mes.damage.entity.Damage;


import com.mes.damage.service.DamageService;


import com.mes.device.PlcParameterObject;


import com.mes.edgglasstask.entity.EdgGlassTaskInfo;


import com.mes.edgglasstask.service.EdgGlassTaskInfoService;


@@ -34,6 +37,7 @@


import java.util.Date;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




/**


 * @Author : zhoush


@@ -58,6 +62,8 @@




    @Autowired


    WebSocketServer webServerService;


    @Autowired


    DamageService damageService;




    @Value("${mes.threshold}")


    private int threshold;


@@ -157,6 +163,36 @@


            }


        }


    }




    @Scheduled(fixedDelay = 1000)


    public void dealDamageTask() {


        Date startDate = new Date();


        log.info("卧式理片破损玻璃清除任务开始执行时间：{}", startDate);


        List<TaskCache> taskCacheList = taskCacheService.list(new LambdaQueryWrapper<TaskCache>().in(TaskCache::getTaskStatus, Const.GLASS_STATE_DAMAGE_TAKE)


                .in(TaskCache::getTaskType, Const.GLASS_CACHE_TYPE_OUT_ALL));


        if (CollectionUtils.isNotEmpty(taskCacheList)) {


            //获取破损/拿走玻璃id


            List<String> glassList = taskCacheList.stream().map(TaskCache::getGlassId).collect(Collectors.toList());


            //将磨边队列的数据删除


            edgGlassTaskInfoService.remove(new LambdaQueryWrapper<EdgGlassTaskInfo>().in(EdgGlassTaskInfo::getGlassId, glassList));


            //将任务表中的数据删除


            taskCacheService.remove(new LambdaQueryWrapper<TaskCache>().in(TaskCache::getGlassId, glassList).in(TaskCache::getTaskType, Const.GLASS_CACHE_TYPE_OUT_ALL));


            List<Damage> damageList = taskCacheList.stream().map(e -> {


                Damage damage = new Damage();


                damage.setGlassId(e.getGlassId());


                damage.setLine(e.getEndCell());


                damage.setWorkingProcedure("冷加工");


                damage.setRemark("磨边前卧式理片");


                damage.setStatus(0);


                damage.setType(e.getTaskStatus());


                return damage;


            }).collect(Collectors.toList());


            damageService.batchInsertDamage(damageList);


        }


        Date endDate = new Date();


        log.info("本次任务结束时间：{}，共耗时：{}ms", endDate, endDate.getTime() - startDate.getTime());


    }






    /**


     * 进片任务


@@ -718,10 +754,8 @@


        jsonObject.append("currentCutTerritory", currentCutTerritorys);


        //log.info("本次识别版图{},++++{}",engineerId,currentCutTerritorys);


        //磨边信息


        List<Map<String, Object>> EdgTasks1 = edgGlassTaskInfoService.selectEdgInfo("2001");


        List<Map<String, Object>> EdgTasks2 = edgGlassTaskInfoService.selectEdgInfo("2002");


        jsonObject.append("EdgTasks1", EdgTasks1);


        jsonObject.append("EdgTasks2", EdgTasks2);


        List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo();


        jsonObject.append("edgTasks", edgTasks);




        //卧室缓存笼内信息


        List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();


@@ -743,6 +777,7 @@


            }


        }


    }




    @Scheduled(fixedDelay = 1000)


    public void cacheGlassIsRun(){


        JSONObject jsonObject = new JSONObject();