From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index 2a998da..0ede466 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -3,6 +3,7 @@
import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO;
import java.util.List;
import java.util.Map;
@@ -25,21 +26,13 @@
*/
EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
- List<EdgStorageCage> selectCacheEmpty();
-
/**
- * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
- *
+ * 鎸夌収璁惧鍙疯繑鍥炲搴旂殑绗煎唴璇︽儏鏁版嵁
+ * @param deviceId
* @return
*/
- List<Map<String, Object>> selectCacheOut();
+ List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId);
- /**
- * 鏌ヨ绗煎唴璇︽儏
- *
- * @return
- */
- List<Map<String, Object>> selectEdgStorageCages();
/**
* 淇敼鐞嗙墖绗间俊鎭�
--
Gitblit v1.8.0