修改进出片逻辑，修改前端调用的接口

ZengTao

2024-06-05 16c79495b4a88229042b4087e791ff86471bb702

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java

@@ -1,10 +1,16 @@
package com.mes.edgglasstask.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,4 +23,62 @@
@Service
public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {

    @Resource
    BigStorageCageDetailsService bigStorageCageDetailsService;
    @Override
    public int judgeTasktype(String plcFeedReqLine){
        LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,plcFeedReqLine)
                .orderByDesc(EdgGlassTaskInfo::getTime);
        EdgGlassTaskInfo edgGlassTaskInfo=baseMapper.selectOne(edgGlassTaskInfoWrapper);
        double width=bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine);
        if(edgGlassTaskInfo.getWidth()<width){
            return 0;
        }else{
            return 1;
        }
    }

    @Override
    public int startTask(){

        double line1Width=bigStorageCageDetailsService.selectGetBoard("1");
        double line2Width=bigStorageCageDetailsService.selectGetBoard("2");

        LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,1)
                .orderByDesc(EdgGlassTaskInfo::getTime);
        List<EdgGlassTaskInfo> edgGlassTaskInfoList1=baseMapper.selectList(edgGlassTaskInfoWrapper);
        int i=0;
        for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList1
             ) {
            if(edgGlassTaskInfo.getWidth()<line1Width){
                i+=1;
                line1Width-=edgGlassTaskInfo.getWidth()+20;
            }
        }
        if(i==2){
            return 2;
        }

        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,2)
                .orderByDesc(EdgGlassTaskInfo::getTime);
        List<EdgGlassTaskInfo> edgGlassTaskInfoList2=baseMapper.selectList(edgGlassTaskInfoWrapper);
        i=0;
        for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList2
        ) {
            if(edgGlassTaskInfo.getWidth()<line2Width){
                i+=1;
                line2Width-=edgGlassTaskInfo.getWidth()+20;
            }
        }
        if(i==2) {
            return 1;
        }else{
            return 2;
        }
    }
}