义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
zhoushihao
2024-07-10 093579c99049bf09ecf8e5d0f80179fde1ddc776 
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java


@@ -7,16 +7,15 @@


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.mes.downglassinfo.entity.DownGlassInfo;


import com.mes.downglassinfo.entity.DownGlassTask;


import com.mes.downglassinfo.mapper.DownGlassInfoMapper;


import com.mes.downglassinfo.mapper.DownGlassTaskMapper;


import com.mes.downglassinfo.service.DownGlassInfoService;


import com.mes.downglassinfo.service.DownGlassTaskService;


import com.mes.downworkstation.entity.DownWorkstation;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;




import javax.annotation.Resource;


import java.util.Date;


import java.util.List;


import java.util.stream.Collectors;


@@ -36,7 +35,7 @@


    @Autowired


    private DownGlassInfoService downGlassInfoService; // MySQL Mapper




    @Autowired


    @Resource


    private DownGlassTaskMapper downGlassTaskMapper; // SQL Server Mapper




    @Override


@@ -47,7 +46,7 @@




        // Step 2: 从 SQL Server 中过滤掉这些玻璃 ID 并查询任务


        QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();


        queryWrapper.eq("task_stauts", 1)


        queryWrapper.eq("task_status", 1)


                .and(qw -> qw.eq("task_type", 2).or().eq("task_type", 3));




        List<DownGlassInfo> excludedGlassIds = downGlassInfoService.list();


@@ -63,7 +62,7 @@


    @Override


    public void updateTaskState(String id) {


        UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();


        updateWrapper.set("task_stauts", 2).eq("id", id);


        updateWrapper.set("task_status", 2).eq("id", id);


        baseMapper.update(new DownGlassTask(), updateWrapper);


    }




@@ -99,7 +98,7 @@


        // 如果主键值不存在，则进行插入操作


        DownGlassTask newDownGlassTask = new DownGlassTask();


        BeanUtils.copyProperties(downGlassTask, newDownGlassTask);


        newDownGlassTask.setTaskStauts(1); // 默认任务状态为1


        newDownGlassTask.setTaskStatus(1); // 默认任务状态为1


        newDownGlassTask.setCreateTime(new Date());


        int rows = baseMapper.insert(newDownGlassTask);


        return rows > 0 ? rows : null;