YiWuProject.git

			@@ -1,14 +1,17 @@
			package com.mes.edgglasstask.service.impl;

			import cn.smallbun.screw.core.util.CollectionUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.utils.RedisUtil;
			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 org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.util.List;
			import java.util.Map;

			/**
			* <p>
			@@ -21,13 +24,30 @@
			@Service
			public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {

			@Autowired
			RedisUtil redisUtil;

			@Override
			public List<Map<String, Object>> selectEdgInfo(String line) {
			LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<>();
			edgGlassWrapper
			.eq(EdgGlassTaskInfo::getLine, line)
			.eq(EdgGlassTaskInfo::getStatus, "1")
			public List<EdgGlassTaskInfo> selectEdgInfo() {
			EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
			if (null == request) {
			request = new EdgGlassInfoRequest();
			}
			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 baseMapper.selectMaps(edgGlassWrapper);
			return this.list(edgGlassWrapper);
			}

			@Override
			public String setEdgGlassInfoRequest(EdgGlassInfoRequest request) {
			if (request == null) {
			redisUtil.deleteObject("edgGlassRequest");
			} else {
			redisUtil.setCacheObject("edgGlassRequest", request);
			}
			return "success";
			}
			}