义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
严智鑫
2024-07-25 8a76767b0a7ad271c8487a02063590b956deb5df 
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java


@@ -18,6 +18,7 @@


import com.mes.temperingglass.service.TemperingGlassInfoService;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


@@ -48,6 +49,9 @@




    @Resource


    private GlassInfoService glassInfoService;




    @Value("${mes.glassGap}")


    private Integer glassGap;




    //进片逻辑


    @Override


@@ -217,15 +221,13 @@


        LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper();


        bigStorageCageDetailsWrapper


                .eq(BigStorageCageDetails::getSlot, slot)


                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)


                .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL);


                .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);




        List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);


        for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList


        ) {


            double widths = bigStorageCageDetails.getWidth();


            double gap = bigStorageCageDetails.getGap();


            width -= widths + gap;


            width = width - widths - glassGap;


        }


        //修改格子剩余宽度


        BigStorageCage bigStorageCage = new BigStorageCage();


@@ -241,7 +243,9 @@


        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));


                        .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);


    }




@@ -252,7 +256,7 @@


        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));


                        .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;


@@ -262,7 +266,7 @@


    @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) AS percentage,COUNT(device_id) - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) AS count")


        wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) / COUNT(device_id), 2) 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);