From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java |  284 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 200 insertions(+), 84 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 6956b36..b7f6d9b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -3,22 +3,25 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.bigstorage.entity.BigStorageCage;
 import com.mes.bigstorage.entity.BigStorageCageDetails;
 import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
 import com.mes.bigstorage.mapper.BigStorageCageMapper;
 import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.common.config.Const;
 import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
 import com.mes.temperingglass.entity.TemperingGlassInfo;
 import com.mes.temperingglass.service.TemperingGlassInfoService;
 import lombok.extern.slf4j.Slf4j;
-import com.mes.glassinfo.entity.GlassInfo;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -34,7 +37,7 @@
  */
 @Service
 @Slf4j
-public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
+public class BigStorageCageServiceImpl extends MPJBaseServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
     @Resource
     private BigStorageCageMapper bigStorageCageMapper;
 
@@ -44,98 +47,164 @@
     @Resource
     private TemperingGlassInfoService temperingGlassInfoService;
 
+    @Resource
+    private GlassInfoService glassInfoService;
+
+    @Value("${mes.glassGap}")
+    private Integer glassGap;
+
+    //杩涚墖閫昏緫
     @Override
     public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
-
-        log.info("1銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠�");
-        LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
-                .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
-        BigStorageCageDetails layoutSlotInfo;
-        layoutSlotInfo= bigStorageCageDetailsMapper.selectOne(wrapper);
-
         BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+        //鐜荤拑涓嶉挗鍖栨椂
+        if (glassInfo.getTemperingLayoutId() == null) {
 
-        log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂");
-        if (layoutSlotInfo.getSlot() != null) {
-            bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
-        } else {
-            log.info("3銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓虹┖鏃惰幏鍙栧綋鍓嶇幓鐠冪増鍥緄d鏄惁瀛樺湪鐞嗙墖绗煎唴");
-            LambdaQueryWrapper<BigStorageCageDetails> BigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
-            BigStorageCageDetailslambdaQueryWrapper
-                    .select(BigStorageCageDetails::getTemperingLayoutId);
-            layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(BigStorageCageDetailslambdaQueryWrapper);
+            BigStorageCage bigStorageCage = baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+                    .selectAll(BigStorageCage.class)
+                    .leftJoin(BigStorageCageDetails.class, on -> on
+                            .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+                            .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+                    .isNull(BigStorageCageDetails::getTemperingLayoutId)
+                    .gt(BigStorageCage::getRemainWidth, 2000)
+                    .orderByAsc(BigStorageCage::getDeviceId, BigStorageCage::getSlot)
+                    .last("limit 1")
+            );
 
-            if(layoutSlotInfo != null){
-                log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
-                BigStorageCage bigStorageCage=bigStorageCageSlot(layoutSlotInfo.getDeviceId());
+            if (bigStorageCage.getSlot() != null) {
                 bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
-            }else{
-                log.info("5銆佽幏鍙栨瘡涓瀛愮増鍥緄d鐨勪釜鏁�");
-                QueryWrapper<BigStorageCageDetails> queryWrapper = new QueryWrapper<>();
-                queryWrapper.select("a.device_id", "COUNT(DISTINCT b.tempering_layout_id) AS layoutCount")
-                        .groupBy("a.device_id")
-                        .apply("LEFT JOIN (SELECT device_id, tempering_layout_id FROM big_storage_cage_details) b ON a.device_id = b.device_id AND a.slot = b.slot")
-                        .orderByAsc("layoutCount")
-                        .orderByAsc("a.device_id");
-                List<Map<String, Object>> BigStorageCageDetailsCount= bigStorageCageDetailsMapper.selectMaps(queryWrapper);
+                bigStorageCageDetails.setDeviceId(bigStorageCage.getDeviceId());
+            }
+        } else {
+            //鐜荤拑閽㈠寲鏃�
+            BigStorageCage bigStorageCage = new BigStorageCage();
 
-                log.info("5銆佹煡璇㈢瀛愬唴鏄惁鏈夊悎閫傜殑鏍煎瓙");
-                for (Map<String, Object> map : BigStorageCageDetailsCount) {
-                    for (Map.Entry<String, Object> entry : map.entrySet()) {
-                        int deviceId = Integer.parseInt(entry.getKey());
-                        BigStorageCage bigStorageCage=bigStorageCageSlot(deviceId);
-                        if(bigStorageCage!=null){
-                            bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
+            bigStorageCage = baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+                    .selectAll(BigStorageCage.class)
+                    .leftJoin(BigStorageCageDetails.class, on -> on
+                            .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+                            .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+                    .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+                    .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() - 1)
+                    .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+            );
+            log.info("1銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠�" + bigStorageCage);
+
+            log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂" + bigStorageCage.getSlot());
+            if (bigStorageCage.getSlot() != null) {
+                bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
+                bigStorageCageDetails.setDeviceId(bigStorageCage.getDeviceId());
+            } else {
+                log.info("3銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓虹┖鏃惰幏鍙栧綋鍓嶇幓鐠冪増鍥緄d鏄惁瀛樺湪鐞嗙墖绗煎唴");
+
+                bigStorageCage = baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+                        .selectAll(BigStorageCage.class)
+                        .leftJoin(BigStorageCageDetails.class, on -> on
+                                .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+                                .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+                        .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+                        .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+                );
+
+                if (bigStorageCage != null) {
+                    log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
+                    BigStorageCage bigStorageCages = bigStorageCageSlot(bigStorageCage.getDeviceId());
+                    bigStorageCageDetails.setSlot(bigStorageCages.getSlot());
+                    bigStorageCageDetails.setDeviceId(bigStorageCages.getDeviceId());
+                } else {
+                    log.info("5銆佽幏鍙栨瘡涓瀛愮増鍥緄d鐨勪釜鏁�");
+                    QueryWrapper<BigStorageCageDetails> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.select("a.device_id", "COUNT(DISTINCT b.tempering_layout_id) AS layoutCount")
+                            .groupBy("a.device_id")
+                            .apply("LEFT JOIN (SELECT device_id, tempering_layout_id FROM big_storage_cage_details) b ON a.device_id = b.device_id AND a.slot = b.slot")
+                            .orderByAsc("layoutCount")
+                            .orderByAsc("a.device_id");
+                    List<Map<String, Object>> bigStorageCageDetailsCount = bigStorageCageDetailsMapper.selectMaps(queryWrapper);
+
+                    log.info("5銆佹煡璇㈢瀛愬唴鏄惁鏈夊悎閫傜殑鏍煎瓙");
+                    boolean found = false;
+                    for (Map<String, Object> map : bigStorageCageDetailsCount) {
+                        for (Map.Entry<String, Object> entry : map.entrySet()) {
+                            int deviceId = Integer.parseInt(entry.getKey());
+                            BigStorageCage bigStorageCages = bigStorageCageSlot(deviceId);
+                            if (bigStorageCage != null) {
+                                bigStorageCageDetails.setSlot(bigStorageCages.getSlot());
+                                bigStorageCageDetails.setDeviceId(deviceId);
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (found) {
+                            break;
                         }
                     }
                 }
             }
         }
-        log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
+
+
         if (bigStorageCageDetails.getSlot() != null) {
+            log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
             bigStorageCageDetails.setState(0);
             bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
-            updateRemainWidth(bigStorageCageDetails.getSlot()) ;
+            updateRemainWidth(bigStorageCageDetails.getSlot());
         }
         return bigStorageCageDetails;
     }
 
     //鑾峰彇绗煎瓙鍐呯殑绌烘牸瀛�
     private BigStorageCage bigStorageCageSlot(Integer deviceId) {
-        LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper=new LambdaQueryWrapper<>();
-                bigStorageCageWrapper
-                        .eq(BigStorageCage::getRemainWidth,"5000")
-                        .eq(BigStorageCage::getEnableState,"0")
-                        .eq(BigStorageCage::getDeviceId,deviceId)
-                        .orderByAsc(BigStorageCage::getSlot)
-                        .last("LIMIT 1");
-                return bigStorageCageMapper.selectOne(bigStorageCageWrapper);
+        LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper = new LambdaQueryWrapper<>();
+        bigStorageCageWrapper
+                .eq(BigStorageCage::getRemainWidth, "5000")
+                .eq(BigStorageCage::getEnableState, "0")
+                .eq(BigStorageCage::getDeviceId, deviceId)
+                .orderByAsc(BigStorageCage::getSlot)
+                .last("LIMIT 1");
+        return bigStorageCageMapper.selectOne(bigStorageCageWrapper);
     }
 
-
+    //鍑虹墖閫昏緫
     @Override
     public boolean outGlass() {
-        List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list();
-        log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�"+temperingGlassInfoList.size());
-
-        if(temperingGlassInfoList!=null){
+        LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
+        temperingGlassInfoWrapper.eq(TemperingGlassInfo::getState, -1);
+        List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(temperingGlassInfoWrapper);
+        log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�" + temperingGlassInfoList.size());
+        if (temperingGlassInfoList.size() > 0) {
             temperingGlassInfoService.addOutTask(temperingGlassInfoList);
             log.info("2銆佹坊鍔犱换鍔″埌浠诲姟琛�");
             return true;
-        }else{
+        } else {
             log.info("3銆佹病鏈夊彲鍑虹殑鐜荤拑鏃惰幏鍙栨槸鍚︽湁灏忕墖鍒伴綈鐨勭増鍥�");
-            LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
-            bigStorageCageDetailslambdaQueryWrapper
-                    .select(BigStorageCageDetails::getTemperingLayoutId)
-                    .groupBy(BigStorageCageDetails::getTemperingLayoutId);
-            List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(bigStorageCageDetailslambdaQueryWrapper);
-            for (Map<String, Object> map : temperingLayoutIdList) {
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    String layoutId = entry.getKey().substring(0, entry.getKey().indexOf('-'));
-                    String layoutNum = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
-                    if (layoutNum.equals(entry.getValue())) {
-                        //4銆佹坊鍔犳閽㈠寲鐗堝浘id鎵�鏈夊皬鐗囧皬鐗囧埌閽㈠寲灏忕墖琛�
+
+            QueryWrapper<BigStorageCageDetails> wrapper = Wrappers.query();
+            wrapper.select("tempering_layout_id", "count(tempering_layout_id)")
+                    .groupBy("tempering_layout_id");
+            List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(wrapper);
+
+            boolean key = false;
+            for (Map<String, Object> row : temperingLayoutIdList) {
+                for (Map.Entry<String, Object> entry : row.entrySet()) {
+                    String temperingId = entry.getKey();
+                    Object temperingNo = entry.getValue();
+
+                    LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+                    glassInfoWrapper.eq(GlassInfo::getTemperingLayoutId, temperingId)
+                            .orderByDesc(GlassInfo::getTemperingFeedSequence);
+                    List<GlassInfo> glassInfoList = glassInfoService.list(glassInfoWrapper);
+                    if (glassInfoList.size() == Integer.parseInt(temperingNo.toString())) {
+                        for (GlassInfo glassInfo : glassInfoList
+                        ) {
+
+                            TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();
+                            BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
+                            temperingGlassInfoService.save(temperingGlassInfo);
+
+                        }
+                        key = true;
+                    }
+                    if (key) {
                         return false;
                     }
                 }
@@ -148,33 +217,80 @@
     @Override
     public void updateRemainWidth(int slot) {
         log.info("鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅锛岃绠楁牸瀛愬墿浣欏搴�");
-        Integer width = 5000;
-        List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
+        double width = 5000;
+        LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper();
+        bigStorageCageDetailsWrapper
+                .eq(BigStorageCageDetails::getSlot, slot)
+                .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL);
+
+        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
         for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
         ) {
-            width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
+            double widths = Math.max(bigStorageCageDetails.getWidth(),bigStorageCageDetails.getHeight()) ;
+            width = width - widths - glassGap;
         }
         //淇敼鏍煎瓙鍓╀綑瀹藉害
         BigStorageCage bigStorageCage = new BigStorageCage();
-        bigStorageCage.setRemainWidth(width);
+        bigStorageCage.setRemainWidth((int) width);
         UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
-        bigStorageCageWrapper.eq("remain_width", width);
+        bigStorageCageWrapper.eq("slot", slot);
         bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
     }
 
+    //鏌ヨ澶х悊鐗囦俊鎭紝鍓嶇灞曠ず鐢�
     @Override
-    public List<BigStorageCage> querybigStorageCageDetail() {
-        //1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
-        List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
-        log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
-        //2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
-        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);
-        Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot));
-        for (BigStorageCage bigStorageCage : bigStorageCages) {
-            List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot());
-            bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails);
-        }
-        return bigStorageCages;
+    public List<BigStorageCage> querybigStorageCageDetailAll() {
+        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
+                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING))
+                        .orderByAsc(BigStorageCage::getDeviceId)
+                        .orderByAsc(BigStorageCage::getSlot);
+        return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
     }
 
+    //鏌ヨ澶х悊鐗囦俊鎭紝鍓嶇灞曠ず鐢�
+    @Override
+    public Map<Integer, List<BigStorageCage>> querybigStorageCageDetail() {
+
+        MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(BigStorageCage.class).selectCollection(BigStorageCageDetails.class, BigStorageCage::getBigStorageCageDetails)
+                .leftJoin(BigStorageCageDetails.class, on -> on.eq(BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
+                        .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL,Const.GLASS_STATE_OUT_ING));
+        List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
+        Map<Integer, List<BigStorageCage>> listMap = bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
+        return listMap;
+    }
+
+    //绗煎瓙浣跨敤鎯呭喌锛岀晫闈㈠睍绀虹敤
+    @Override
+    public List<Map<String, Object>> selectBigStorageCageUsage() {
+        QueryWrapper<BigStorageCage> wrapper = new QueryWrapper<>();
+        wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) / COUNT(device_id), 2)*100 AS percentage,SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) AS count")
+
+                .groupBy("device_id");
+        List<Map<String, Object>> bigStorageCageUsages = baseMapper.selectMaps(wrapper);
+
+        return bigStorageCageUsages;
+    }
+
+    //绗煎瓙鐨勫惎鐢�/绂佺敤
+    @Override
+    public void updateStorageCageDisabled(int slot, int enableState) {
+        BigStorageCage bigStorageCage = new BigStorageCage();
+        bigStorageCage.setEnableState(enableState);
+        LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper = new LambdaQueryWrapper<>();
+        bigStorageCageWrapper.eq(BigStorageCage::getSlot, slot);
+        baseMapper.update(bigStorageCage, bigStorageCageWrapper);
+    }
+
+    @Override
+    public List<Integer> queryFreeDeviceByUsed(double thickness) {
+        return baseMapper.queryFreeDeviceByUsed(thickness);
+    }
+
+//    @Override
+//    public List<Integer> queryFreeDeviceByNotUsed(double thickness) {
+//        return baseMapper.queryFreeDeviceByNotUsed(thickness);
+//    }
 }

--
Gitblit v1.8.0