From 6466ffb86e19485aa8dccc55aad3aa53b6780e4d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 七月 2024 08:42:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 2d2bafc..239fabe 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
@@ -4,6 +4,7 @@
import com.mes.taskcache.entity.TaskCache;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -15,24 +16,61 @@
*/
public interface TaskCacheService extends IService<TaskCache> {
- //娣诲姞鐞嗙墖绗间换鍔�
- public boolean insertTaskCache();
- //鏌ヨ纾ㄨ竟浠诲姟
- public List<TaskCache> selectEdgInfo(String line);
+ boolean insertTaskCache(TaskCache taskCache);
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ *
+ * @param line
+ * @return
+ */
+ List<Map<String,Object>> selectEdgInfo(String line);
- //鏌ヨ鐞嗙墖浠诲姟
- public List<TaskCache> selectCacheInfo();
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ *
+ * @param line
+ * @return
+ */
+ TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes);
- //鏌ヨ鍏ㄩ儴浠诲姟
- public List<TaskCache> selectAll();
+ /**
+ * 鏌ヨ鐞嗙墖浠诲姟
+ *
+ * @return
+ */
+ List<TaskCache> selectCacheInfo();
- //鏌ヨ杩涚墖浠诲姟
- public List<TaskCache> selectInputTaskCache();
+ /**
+ * 鏌ヨ鍏ㄩ儴浠诲姟
+ * @return
+ */
+ List<TaskCache> selectAll();
- //鏌ヨ鍑虹墖浠诲姟
- public List<TaskCache> selectOutTaskCache();
+ /**
+ * 鏌ヨ杩涚墖浠诲姟
+ * @return
+ */
+ List<TaskCache> selectInputTaskCache();
- //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- public boolean selectLastOutCacheInfo();
+ /**
+ * 鏌ヨ鍑虹墖浠诲姟
+ * @return
+ */
+ List<TaskCache> selectOutTaskCache();
+
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
+ List<TaskCache> selectLastOutCacheInfos(int line);
+
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
+ TaskCache selectLastOutCacheInfo(int line);
+
}
--
Gitblit v1.8.0