From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 06 十一月 2024 23:22:03 +0800 Subject: [PATCH] 1、卧理进出片功能已完成开发,与电气调试中,新增磨边队列表 2、卧理新增历史任务表,记录卧理两台设备执行过的历史数据 3、大理片笼opc任务,新增玻璃进笼计算方式:在笼内存储同炉的多片玻璃,笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发,新增历史任务表记录上片的历史信息 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java index c5a6f02..07275d1 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java @@ -1,9 +1,11 @@ package com.mes.taskcache.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.github.yulichang.base.MPJBaseService; import com.mes.taskcache.entity.TaskCache; import java.util.List; +import java.util.Map; /** * <p> @@ -13,24 +15,29 @@ * @author zhoush * @since 2024-04-07 */ -public interface TaskCacheService extends IService<TaskCache> { +public interface TaskCacheService extends MPJBaseService<TaskCache> { - /** - * 娣诲姞鐞嗙墖绗间换鍔� - * @param taskCache - * @return - */ + boolean insertTaskCache(TaskCache taskCache); - /** * 鏌ヨ纾ㄨ竟浠诲姟 + * * @param line * @return */ - List<TaskCache> selectEdgInfo(String line); + List<Map<String,Object>> selectEdgInfo(String line); + + /** + * 鏌ヨ纾ㄨ竟浠诲姟 + * + * @param line + * @return + */ + TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes); /** * 鏌ヨ鐞嗙墖浠诲姟 + * * @return */ List<TaskCache> selectCacheInfo(); @@ -65,6 +72,7 @@ * @param line * @return */ - TaskCache selectLastOutCacheInfo(String line); + TaskCache selectLastOutCacheInfo(int line); + } -- Gitblit v1.8.0