From 3fe19c705a4b0e32096b5c39c5489ea111a10e15 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 09:58:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 62 ++++++++++++++----------------
1 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 0934ab6..1e132e5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -1,15 +1,11 @@
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.core.conditions.query.QueryWrapper;
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 com.mes.tools.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,7 +13,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -29,34 +25,34 @@
@Autowired
RedisUtil redisUtil;
- @Override
- public List<EdgGlassTaskInfo> selectEdgInfo() {
- EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
-
- if (null == request) {
- request = new EdgGlassInfoRequest();
- }
- if (null == request.getBeginDate()) {
- request.setBeginDate(DateUtil.getBeginDate());
- request.setEndDate(DateUtil.getEndDate());
- }
- 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);
- }
-
- @Override
- public String setEdgGlassInfoRequest(EdgGlassInfoRequest request) {
- if (request == null) {
- redisUtil.deleteObject("edgGlassRequest");
- } else {
- redisUtil.setCacheObject("edgGlassRequest", request);
- }
- return "success";
- }
+ //@Override
+// public List<EdgGlassTaskInfo> selectEdgInfo() {
+// EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
+//
+// if (null == request) {
+// request = new EdgGlassInfoRequest();
+// }
+// if (null == request.getBeginDate()) {
+// request.setBeginDate(DateUtil.getBeginDate());
+// request.setEndDate(DateUtil.getEndDate());
+// }
+// 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);
+// }
+//
+// @Override
+// public String setEdgGlassInfoRequest(EdgGlassInfoRequest request) {
+// if (request == null) {
+// redisUtil.deleteObject("edgGlassRequest");
+// } else {
+// redisUtil.setCacheObject("edgGlassRequest", request);
+// }
+// return "success";
+// }
/**
* 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
--
Gitblit v1.8.0