From 2b91b242113bd10f1be241d19ab154e9ad6506cd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 10 六月 2025 14:18:00 +0800
Subject: [PATCH] 国际化命名

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 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 f52662f..2c89397 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,9 +3,10 @@
 import com.github.yulichang.base.MPJBaseService;
 import com.mes.edgstoragecage.entity.EdgStorageCage;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
+import com.mes.edgstoragecage.entity.vo.EdgStorageCageVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,33 +24,43 @@
      *
      * @return
      */
-    EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
+    EdgStorageCage selectNearestEmpty(Integer currentCell, int deviceId, boolean flag);
 
     /**
-     * 鏌ヨ绗煎唴绌烘牸
+     * 鎸夌収璁惧鍙疯繑鍥炲搴旂殑绗煎唴璇︽儏鏁版嵁
+     * @param deviceId
      * @return
      */
-    List<EdgStorageCage> selectCacheEmpty();
+    List<EdgStorageCageVO> selectEdgStorageCagesByDeviceId(int deviceId);
 
-    /**
-     * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
-     * @return
-     */
-    List<Map<String, Object>> selectCacheOut();
-
-    /**
-     * 鏌ヨ绗煎唴璇︽儏
-     * @return
-     */
-    List<Map<String, Object>> selectEdgStorageCages();
 
     /**
      * 淇敼鐞嗙墖绗间俊鎭�
+     *
      * @param edgStorageCage
      * @return
      */
     boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
 
+    /**
+     * 鏇存柊鐞嗙墖绗艰鎯呬俊鎭�
+     *
+     * @param edgStorageCageId
+     * @param edgStorageCageDetails
+     * @return
+     */
     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);
+
+    void resetSlotRemainWidth(List<EdgSlotRemainVO> edgSlotRemainVOS);
 }

--
Gitblit v1.8.0