大理片笼:新增获取理片笼信息及详情信息

zhoushihao

2024-07-05 057c48f407a4c24ca11678d019920ae78792c9ff

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
@@ -18,13 +17,10 @@
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.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -141,7 +137,6 @@
                }
            }
        }



        if (bigStorageCageDetails.getSlot() != null) {
@@ -267,6 +262,19 @@
        return bigStorageCages;
    }

    //查询大理片信息，前端展示用
    @Override
    public 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))
                .eq(BigStorageCage::getEnableState, Const.SLOT_ON);

        return bigStorageCageMapper.selectJoinList(BigStorageCage.class, wrapper);
    }

    //笼子使用情况，界面展示用
    @Override
    public List<Map<String, Object>> selectBigStorageCageUsage() {