From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 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 39b0e92..a9d0721 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
@@ -1,37 +1,52 @@
package com.mes.edgstoragecage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
-import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import java.util.List;
import java.util.Map;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
-public interface EdgStorageCageService extends IService<EdgStorageCage> {
+public interface EdgStorageCageService extends MPJBaseService<EdgStorageCage> {
- //鏌ヨ绗煎唴绌烘牸
- public List<EdgStorageCage> selectCacheEmpty();
+ /**
+ * 鏌ヨ绗煎唴绂绘寚瀹氭牸瀛愭渶杩戠┖鏍�
+ * @return
+ */
+ EdgStorageCage selectNearestEmpty(int currentSlot);
- //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
- public List<EdgStorageCage> selectCacheOut();
+ /**
+ * 鏌ヨ绗煎唴绌烘牸
+ * @return
+ */
+ List<EdgStorageCage> selectCacheEmpty();
- //鏌ヨ绗煎唴璇︽儏
- public List<Map> selectCacheInfos();
+ /**
+ * 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ * @return
+ */
+ List<Map<String, Object>> selectCacheOut();
- //娣诲姞鐞嗙墖绗间俊鎭� 浼犲叆glassid
- public boolean insertCacheInfo(String glassid);
+ /**
+ * 鏌ヨ绗煎唴璇︽儏
+ * @return
+ */
+ List<Map<String, Object>> selectEdgStorageCages();
- //淇敼鐞嗙墖绗煎唴淇℃伅
- public boolean updateCacheInfo(String cacheId);
+ /**
+ * 淇敼鐞嗙墖绗间俊鎭�
+ * @param edgStorageCage
+ * @return
+ */
+ boolean updateEdgStorageCage(EdgStorageCage edgStorageCage);
- //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
- public boolean deleteCacheInfo(String cacheId);
+ boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails);
}
--
Gitblit v1.8.0