YiWuProject.git

			@@ -1,23 +1,24 @@
			package com.mes.edgstoragecage.service.impl;

			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.query.MPJQueryWrapper;
			import com.mes.edgstoragecage.entity.EdgStorageCage;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
			import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
			import com.mes.edgstoragecage.service.EdgStorageCageService;
			import com.mes.uppattenusage.entity.UpPattenUsage;
			import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			* <p>
			* 服务实现类
			* 服务实现类
			* </p>
			*
			* @author zhoush
			@@ -30,50 +31,50 @@
			EdgStorageCageMapper edgStorageCageMapper;
			@Autowired
			EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
			@Autowired
			UpPattenUsageMapper upPattenUsageMapper;

			@Override
			//查询笼内空格 EdgStorageCage as esc left join EdgStorageCageDetails as escd esc.device_id=escd.device_id
			public List<EdgStorageCage> selectCacheEmpty() {
			List<EdgStorageCage> listEdgStorageCage = edgStorageCageMapper.selectList(null);
			;
			List<EdgStorageCageDetails> orderList = listEdgStorageCage.stream()
			.flatMap(user -> edgStorageCageDetailsMapper.selectList(
			new QueryWrapper<EdgStorageCageDetails>().eq("user_id", user.getId())).stream()
			)
			.collect(Collectors.toList());

			return listEdgStorageCage;
			//查询笼内空格
			public List<Map> selectCacheEmpty(){
			List<Map> map=edgStorageCageMapper.selectJoinList(
			Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
			.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
			.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
			.isNull("escd.slot")
			);
			return map;
			}

			@Override
			//查询笼内出片任务
			public List<EdgStorageCage> selectCacheOut() {
			List<EdgStorageCage> list = new ArrayList<EdgStorageCage>();
			//查询笼内出片任务按钢化版图号+版图内序号
			public List<Map> selectCacheOut(){
			List<Map> list= upPattenUsageMapper.selectJoinList(
			Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
			.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
			.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
			.isNotNull("escd.slot")
			.orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
			);
			return list;
			}

			@Override
			//理片缓存详情
			public List<Map> selectCacheInfos() {
			List<Map> mapList = new ArrayList<>();
			return mapList;
			public List<Map> selectEdgStorageCages(){
			List<Map> map=edgStorageCageMapper.selectJoinList(
			Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
			.select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
			.leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
			);
			return map;
			}

			@Override
			//添加理片笼信息传入glassid
			public boolean insertCacheInfo(String glassid) {
			return false;
			//修改理片笼内信息功能：对笼内栅格玻璃【添加/删除/更换】
			public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
			edgStorageCageMapper.updateById(edgStorageCage);
			return true;
			}

			@Override
			//修改理片笼内信息
			public boolean updateCacheInfo(String cacheId) {
			return false;
			}

			@Override
			//删除理片笼内信息
			public boolean deleteCacheInfo(String cacheId) {
			return false;
			}
			}