~admin/HangZhouMes.git

			@@ -1,25 +1,19 @@
			package com.mes.rawglasstask.service.impl;

			import com.baomidou.mybatisplus.core.assist.ISqlRunner;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import cn.hutool.core.collection.CollectionUtil;
			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.pp.entity.request.Reportingdamage;
			import com.mes.rawglasstask.entity.RawGlassStorageTask;
			import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
			import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
			import com.mes.rawglasstask.service.RawGlassStorageTaskService;
			import com.mes.tools.DateUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;

			import java.text.DateFormat;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.util.Date;
			import java.util.List;
			import java.util.Map;

			/**
			* @author system
			@@ -29,41 +23,31 @@
			@Slf4j
			public class RawGlassRawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {


			@Autowired
			RedisUtil redisUtil;

			@Override
			public List<RawGlassStorageTask> findAll() {
			public List<RawGlassStorageTask> listRawGlassTask() {
			RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
			if (null == request) {
			request = new RawGlassTaskRequest();
			}
			if (request.getBeginDate() == null) {
			//设置默认时间 startDate：开始时间 endDate：结束时间
			DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
			Date startDate=null;
			Date endDate=null;
			try {
			startDate= df.parse("2022-01-01");
			endDate= df.parse("2025-01-01");
			}catch (ParseException e){
			e.printStackTrace();
			}
			request.setCreateTime(startDate);//
			request.setPatternQuantity(endDate);
			//return null;
			request.setBeginDate(DateUtil.getBeginDate());
			request.setEndDate(DateUtil.getEndDate());
			}
			return list(new LambdaQueryWrapper<RawGlassStorageTask>()
			.between(RawGlassStorageTask::getCreateTime, request.getBeginDate(), request.getEndDate())
			.in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
			.in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
			.orderByDesc(RawGlassStorageTask::getCreateTime));

			QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
			queryWrapper.ge("create_time", request.getCreateTime())//大于时间
			.le("create_time",request.getPatternQuantity());//小于时间
			// .orderByDesc("enable_id");//排序字段
			if(!request.getEnableType().isEmpty()&&request.getEnableType().size()>0){
			queryWrapper.eq("enable_type", request.getEnableType().get(0));
			}if(!request.getEnableState().isEmpty()&&request.getEnableState().size()>0){
			queryWrapper.eq("enable_state", request.getEnableState().get(0));
			}

			return baseMapper.selectList(queryWrapper);
			// return list(new QueryWrapper<RawGlassStorageTask>()
			// .in(CollectionUtil.isNotEmpty(request.getTaskState()), "task_state", request.getTaskState())
			// .in(CollectionUtil.isNotEmpty(request.getTaskType()), "task_type", request.getTaskType())
			// .between("create_time", request.getBeginDate(), request.getEndDate())
			// .orderByDesc("create_time"));
			}

			@Override
			@@ -73,49 +57,7 @@
			} else {
			redisUtil.setCacheObject("rawGlassTaskRequest", request);
			}
			log.info("前端传入参数：{}",request);
			log.info("前端传入参数：{}", request);
			return "success";
			}

			@Override
			public List<RawGlassStorageTask> selectTask() {
			return list();
			}

			@Override
			public List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rw) {
			QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
			//下面这个列是查询字段，不要可以删掉默认查询全部
			queryWrapper.ge("create_time", rw.getCreateTime())//大于时间
			.le("create_time",rw.getPatternQuantity())//小于时间
			.groupBy("enable_id");//排序字段
			if(rw.getEnableType()!=null){
			queryWrapper.eq("enable_type", rw.getEnableType());
			}if(rw.getEnableState()!=null){
			queryWrapper.eq("enable_state", rw.getEnableState());
			}
			return baseMapper.selectList(queryWrapper);
			// return list(queryWrapper);
			}
			@Override
			public boolean insertRawGlassStorageTask(RawGlassStorageTask rw) {
			return this.save(rw);
			}
			@Override
			public boolean updateRawGlassStorageTask(String originate_slot) {
			UpdateWrapper<RawGlassStorageTask> wrapper = new UpdateWrapper<>();
			wrapper.set("originate_slot","1005")
			.eq( "originate_slot",originate_slot);
			return update(wrapper);
			}

			@Override
			public boolean deleteRawGlassStorageTask(String id) {
			QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("id", id);
			return remove(queryWrapper);
			}



			}