From 34b5340108f6613d2ad6fd036501d33d8d18bd50 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 15:10:03 +0800
Subject: [PATCH] 还原部分被覆盖代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 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 b88c9c6..a5ca99a 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,14 +1,18 @@
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -21,13 +25,44 @@
@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";
+ }
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ * @param
+ * @return
+ */
+ @Override
+ public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
+ QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
+ .select("line")
+ .eq("status", 1)
+ .groupBy("line");
+
+ return this.list(wrapper);
}
}
--
Gitblit v1.8.0