From 78ca7ed85c42d183b5c0c039a9d3897f1529339a Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期四, 18 四月 2024 14:20:25 +0800 Subject: [PATCH] 更新语句 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java index 618c2b1..05c3b11 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java @@ -1,15 +1,22 @@ package com.mes.downstorage.service.impl; +import com.github.yulichang.query.MPJQueryWrapper; import com.mes.downstorage.entity.DownStorageCage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mes.downstorage.entity.DownStorageCageDetails; +import com.mes.downstorage.mapper.DownStorageCageDetailsMapper; import com.mes.downstorage.mapper.DownStorageCageMapper; import com.mes.downstorage.service.DownStorageCageService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; - +import java.util.Collections; +import java.util.Comparator; /** * <p> * 鏈嶅姟瀹炵幇绫� @@ -18,6 +25,7 @@ * @author zhoush * @since 2024-03-27 */ +@Slf4j @Service public class DownStorageCageServiceImpl extends ServiceImpl<DownStorageCageMapper, DownStorageCage> implements DownStorageCageService { @Autowired @@ -28,4 +36,111 @@ // downStorageCageMapper.selectJoin(); return null; }; + + + + @Override + public List<Map> getCacheLeisure() { + log.info(" 鏌ヨ绗煎瓙鍐呯┖闂�"); + List<Map> map = downStorageCageMapper.selectJoinList( + Map.class, new MPJQueryWrapper<DownStorageCageDetails>() + .select("escd.*") + .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") + .isNull("escd.slot") + .orderByAsc("escd.slot") + ); + return map; + } + +// @Override +// public List<Map> getCacheOut(int start, int end) { +// log.info(" 鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�"); +// List<Map> map = downStorageCageMapper.selectJoinList( +// Map.class, new MPJQueryWrapper<DownStorageCageDetails>() +// .select("escd.*") +// .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") +// .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id") +// .isNotNull("escd.slot") +// .between("dw.workstation_id", start, end) +// .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence") +// ); +// return map; +// } + + + + + + @Override + public List<Map> getCacheOut(int start, int end) { + log.info("鏍规嵁浼犲叆鐨勫伐浣嶆煡璇㈢鍚堟寜鐓ч『搴忓拰澶у皬鍑虹墖鐨勫皬鐗�"); + List<Map> map = downStorageCageMapper.selectJoinList( + Map.class, new MPJQueryWrapper<DownStorageCageDetails>() + .select("escd.*") + .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") + .leftJoin("down_workstation dw on escd.flow_card_id = dw.flow_card_id") + .isNotNull("escd.slot") + .between("dw.workstation_id", start, end) + .orderByAsc("escd.tempering_layout_id, escd.tempering_feed_sequence") + ); + + // 瀵硅幏鍙栫殑鏁版嵁鍒楄〃鎸夌収瀹藉害杩涜鎺掑簭 + Collections.sort(map, new Comparator<Map>() { + @Override + public int compare(Map o1, Map o2) { + // 鑾峰彇瀹藉害骞舵瘮杈� + double width1 = (double) o1.get("width"); + double width2 = (double) o2.get("width"); + return Double.compare(width2, width1); + } + }); + + return map; + } + + + @Override + public List<Map> getCacheInfo() { + log.info(" 鏌ヨ绗煎瓙鍐呬俊鎭�"); + List<Map> map = downStorageCageMapper.selectJoinList( + Map.class, new MPJQueryWrapper<DownStorageCageDetails>() + .select("escd.*") + .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") + .orderByAsc("t.slot") + ); + return map; + } + + @Override + public List<Map> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) { + List<Map> map = downStorageCageMapper.selectJoinList( + Map.class, new MPJQueryWrapper<DownStorageCageDetails>() + .select("escd.*") + .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") + .isNotNull("escd.slot") + .eq("escd.tempering_layout_id", tempering_layout_id) + .lt("escd.tempering_feed_sequence", tempering_feed_sequence) + .gt("t.remain_width", width) + .orderByAsc("escd.tempering_feed_sequence") + ); + return map; + } + + @Override + public List<Map> getIsExistIntoCacheByLayout(Integer tempering_layout_id, double width) { + List<Map> map = downStorageCageMapper.selectJoinList( + Map.class, new MPJQueryWrapper<DownStorageCageDetails>() + .select("escd.*") + .leftJoin("down_storage_cage_details escd on t.slot = escd.slot") + .isNotNull("escd.slot") + .lt("escd.tempering_layout_id", tempering_layout_id) + .gt("t.remain_width", width) + .orderByDesc("escd.tempering_layout_id, escd.tempering_feed_sequence") + ); + return map; + } + + + + } -- Gitblit v1.8.0