From fe28446d11126177d7edd250b58a44f2288ff153 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 13 八月 2024 08:40:36 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java index 3443a6f..cb15785 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java @@ -2,9 +2,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.mes.edgglasstask.entity.EdgGlassTaskInfo; +import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest; +import com.mes.taskcache.entity.TaskCache; import java.util.List; -import java.util.Map; /** * <p> @@ -16,5 +17,13 @@ */ public interface EdgGlassTaskInfoService extends IService<EdgGlassTaskInfo> { - List<Map<String, Object>> selectEdgInfo(String line); + List<EdgGlassTaskInfo> selectEdgInfo(); + + String setEdgGlassInfoRequest(EdgGlassInfoRequest request); + /** + * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯 + * @param + * @return + */ + List<EdgGlassTaskInfo> selectTaskCacheIsRun(); } -- Gitblit v1.8.0