YiWuProject.git

			@@ -11,6 +11,7 @@
			import com.mes.tools.DateUtil;
			import com.mes.utils.RedisUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import java.util.List;
			@@ -29,6 +30,10 @@
			@Autowired
			RedisUtil redisUtil;

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


			@Override
			public List<EdgGlassTaskInfo> selectEdgInfo() {
			EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
			@@ -42,10 +47,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 +79,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);