From 36c8b97ef1d250e724696cae846a754d48a92512 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 04 六月 2024 12:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 e994f15..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
@@ -1,11 +1,10 @@
package com.mes.taskcache.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
import com.mes.taskcache.entity.TaskCache;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,22 +16,27 @@
*/
public interface TaskCacheService extends IService<TaskCache> {
- /**
- * 娣诲姞鐞嗙墖绗间换鍔�
- * @param taskCache
- * @return
- */
- boolean insertTaskCache(TaskCache taskCache);
+ 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();
@@ -60,7 +64,7 @@
* @param line
* @return
*/
- List<TaskCache> selectLastOutCacheInfos(String line);
+ List<TaskCache> selectLastOutCacheInfos(int line);
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
--
Gitblit v1.8.0