修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔

ZengTao

2025-03-28 f68d3c71819feb59e7a227a5d992b059b900916c

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

@@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
@@ -35,12 +36,12 @@
@Service
public class TaskCacheServiceImpl extends MPJBaseServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {

    @Autowired
    @Resource
    EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

    @Autowired
    @Resource
    GlassInfoMapper glassInfoMapper;
    @Autowired
    @Resource
    private TaskCacheMapper taskCacheMapper;


@@ -181,6 +182,36 @@
    }



    @Override
    public List<TaskCache> selectTaskCache(TaskCache taskCache, String startTime, String endTime){
        if (endTime != null && !endTime.isEmpty()) {
            endTime = endTime + " 23:59:59";
        }
        LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<>();
        if (taskCache.getStartCell() != null) {
            wrapper.eq(TaskCache::getStartCell, taskCache.getStartCell());
        }
        if (taskCache.getEndCell() != 0) {
            wrapper.eq(TaskCache::getEndCell, taskCache.getEndCell());
        }
        if (taskCache.getTaskStatus() != -1) {
            wrapper.eq(TaskCache::getTaskStatus, taskCache.getTaskStatus());
        }
        if (taskCache.getTaskType() != -1) {
            wrapper.eq(TaskCache::getTaskType, taskCache.getTaskType());
        }
        if (startTime != null && !startTime.isEmpty()) {
            wrapper.ge(TaskCache::getCreateTime, startTime);
        }
        if (endTime != null && !endTime.isEmpty()) {
            wrapper.le(TaskCache::getCreateTime, endTime);
        }
        wrapper.orderByDesc(TaskCache::getCreateTime);
        wrapper.and(item -> item.eq(TaskCache::getDeleted, 0)
                .or()
                .eq(TaskCache::getDeleted, 1));
        wrapper.between(TaskCache::getCreateTime, startTime, endTime);
        return baseMapper.selectList(wrapper);
    }

}