Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-05-16 4185a44f983c7aa3cf45ec03a65eece9e847e229

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java

@@ -2,16 +2,19 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -23,38 +26,114 @@
 */
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
    //添加理片笼任务

    @Autowired
    EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
    /**
     * 添加理片笼任务
     * @param taskCache
     * @return
     */
    @Override
    public boolean insertTaskCache(TaskCache taskCache){
        return this.save(taskCache);
        baseMapper.insert(taskCache);
        return true;
    }

    //查询磨边任务
    public List<TaskCache> selectEdgInfo(String line){
    /**
     * 查询磨边任务
     * @param line
     * @return
     */
    @Override
    public List<Map<String,Object>> selectEdgInfo(String line) {
        List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
                .selectAll(TaskCache.class)
                .eq(TaskCache::getEndCell,line)
                .eq(TaskCache::getTaskStatus,1));
        List<Map<String,Object>> result=new ArrayList<>();
        for(TaskCache taskCache1:taskCache){
            Map<String,Object> map=new HashMap<>();
            EdgStorageCageDetails edgStorageCageDetails=edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>()
                    .selectAll(EdgStorageCageDetails.class)
                    .eq(EdgStorageCageDetails::getGlassId,taskCache1.getGlassId()));
            if(edgStorageCageDetails!=null){
                map.put("Line",line);
                map.put("Width",edgStorageCageDetails.getWidth());
                map.put("Height",edgStorageCageDetails.getHeight());
                map.put("Thickness",edgStorageCageDetails.getThickness());
                map.put("GlassId",edgStorageCageDetails.getGlassId());
                map.put("FlowCardId",edgStorageCageDetails.getFlowCardId());
                map.put("TemperingLayoutId",edgStorageCageDetails.getTemperingLayoutId());
                map.put("TemperingFeedSequence",edgStorageCageDetails.getTemperingFeedSequence());
                result.add(map);
            }
        }

        return result;
//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
    }

    //查询理片任务
    /**
     * 查询待理片工作的任务
     * @return
     */
    @Override
    public List<TaskCache> selectCacheInfo(){

        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
    }

    //查询全部任务
    public List<TaskCache> selectAll(){

    /**
     * 查询全部任务
     * @return
     */
    @Override
    public List<TaskCache> selectAll() {
        return baseMapper.selectList(null);
    }

    //查询进片任务
    /**
     * 查询待进片任务
     * @return
     */
    @Override
    public List<TaskCache> selectInputTaskCache(){
        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1));

//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
    }

    //查询出片任务
    /**
     * 查询待出片任务
     * @return
     */
    @Override
    public List<TaskCache> selectOutTaskCache(){

        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2));
//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
    }

    //查询  A09  或 A10 最新的一片 出片任务
    public List<TaskCache> selectLastOutCacheInfo(String line){

    /**
     * 查询  A09  或 A10 最新的一片 出片任务
     * @param line
     * @return
     */
    @Override
    public List<TaskCache> selectLastOutCacheInfos(int line){
        return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
    }

    /**
     * 查询  A09  或 A10 最新的一片 出片任务
     * @param line
     * @return
     */
    @Override
    public TaskCache selectLastOutCacheInfo(int line){
        return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
    }


}