Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-09 c0505074f5149b7f0c7fe26822e793eac18319f3

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java

@@ -1,6 +1,8 @@
package com.mes.downworkstation.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downglassinfo.entity.DownGlassInfo;
@@ -25,7 +27,7 @@
public class DownWorkstationTaskServiceImpl extends ServiceImpl<DownWorkstationTaskMapper, DownWorkstationTask> implements DownWorkstationTaskService {


    public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
    public void insertdownWorkstationtask(DownGlassInfo downGlassInfo,String workstationid) {
        DownWorkstationTask entity = new DownWorkstationTask();
        // 查询当前最大的 id 值
        Long maxId = getMaxId();
@@ -33,9 +35,10 @@
        Long newId = (maxId == null) ? 1 : maxId + 1;


        BeanUtils.copyProperties(entity,downGlassInfo);
        BeanUtils.copyProperties(downGlassInfo,entity);
        entity.setId(newId); // 设置手动递增的 id
        entity.setState(1);
        entity.setWorkstationid(workstationid);
        baseMapper.insert(entity);
    }

@@ -62,12 +65,24 @@
        queryWrapper.eq("state", 1);
        return baseMapper.selectList(queryWrapper);
    }
    @Override
    public void updateTaskStateToZero(long id) {
        UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
        updateWrapper.set("state", 0).eq("id", id);

        baseMapper.update(new DownWorkstationTask(), updateWrapper);
    @Override
    public void updateTaskState(DownWorkstationTask downWorkstationTask) {
        LambdaUpdateWrapper<DownWorkstationTask> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();

        lambdaUpdateWrapper.set(DownWorkstationTask::getState, 2)
                .eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId());

        baseMapper.update(new DownWorkstationTask(), lambdaUpdateWrapper);
    }


    @Override
    public void deleteTask(DownWorkstationTask downWorkstationTask) {
        LambdaQueryWrapper<DownWorkstationTask> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId());

        baseMapper.delete(queryWrapper);
    }

}