From 04aeda48634ff70d08d9fb7fac4d60d4c96b6992 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 08:15:24 +0800
Subject: [PATCH] 原片仓储代码功能编写：基础逻辑、代码规范、添加/修改字段，移除无用的方法，新增表连接查询mapper
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 96 +++++++++--------------------------------------
1 files changed, 19 insertions(+), 77 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
index 40b5ca3..aae2bf7 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
@@ -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);
- }
-
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0