From 73933a5b8046446240bae15d3f0614187033ad16 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 13 八月 2024 15:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java | 12 ++++++++++--
1 files changed, 10 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..45651a3 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,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -16,5 +16,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