Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

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

@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.common.config.ConstSysConfig;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.tools.DateUtil;
import com.mes.utils.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
@@ -28,9 +31,16 @@

    @Autowired
    RedisUtil redisUtil;
    @Resource
    SysConfigService sysConfigService;

//    @Value("${mes.ratio}")
//    private int ratio;


    @Override
    public List<EdgGlassTaskInfo> selectEdgInfo() {
        int ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
        EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");

        if (null == request) {
@@ -42,10 +52,16 @@
        }
        LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<EdgGlassTaskInfo>()
                .in(CollectionUtils.isNotEmpty(request.getCellList()), EdgGlassTaskInfo::getLine, request.getCellList())
                .in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getStatus, request.getStateList())
                .between(null != request.getBeginDate(), EdgGlassTaskInfo::getTime, request.getBeginDate(), request.getEndDate())
                .orderByDesc(EdgGlassTaskInfo::getTime);
        return this.list(edgGlassWrapper);
                .in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getState, request.getStateList())
                .between(null != request.getBeginDate(), EdgGlassTaskInfo::getCreateTime, request.getBeginDate(), request.getEndDate())
                .orderByDesc(EdgGlassTaskInfo::getCreateTime);
        List<EdgGlassTaskInfo> list = this.list(edgGlassWrapper);
        list.stream().forEach(e -> {
            e.setWidth(e.getWidth() / ratio);
            e.setHeight(e.getHeight() / ratio);
            e.setThickness(e.getThickness() / ratio);
        });
        return list;
    }

    @Override
@@ -68,7 +84,7 @@
    public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
        QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
                .select("line")
                .eq("status", 1)
                .eq("state", 1)
                .groupBy("line");

        return this.list(wrapper);