From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期五, 08 十一月 2024 14:50:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 73b2bd4..2a998da 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 @@ -26,14 +26,17 @@ EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag); List<EdgStorageCage> selectCacheEmpty(); + /** * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏 + * * @return */ List<Map<String, Object>> selectCacheOut(); /** * 鏌ヨ绗煎唴璇︽儏 + * * @return */ List<Map<String, Object>> selectEdgStorageCages(); @@ -55,4 +58,15 @@ */ boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails); + /** + * 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛� + * + * @param deviceId + * @param width + * @param height + * @param slot + * @return + */ + EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot); + } -- Gitblit v1.8.0