From 652824c20097c7ad02b920690dba896532984bbb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:58:51 +0800
Subject: [PATCH] 还原方法
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 6 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 52 ++++++++++++++++++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java | 11 +++++
3 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
index 1589b7d..7df5e0f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/EdgGlassTaskInfoService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +15,13 @@
*/
public interface EdgGlassTaskInfoService extends IService<EdgGlassTaskInfo> {
+ // List<EdgGlassTaskInfo> selectEdgInfo();
+
+// String setEdgGlassInfoRequest(EdgGlassInfoRequest request);
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ * @param
+ * @return
+ */
+ List<EdgGlassTaskInfo> selectTaskCacheIsRun();
}
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 34a06f4..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,10 +1,15 @@
package com.mes.edgglasstask.service.impl;
+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.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +22,51 @@
@Service
public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {
+ @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";
+// }
+
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ *
+ * @param
+ * @return
+ */
+ @Override
+ public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
+ QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
+ .select("line")
+ .eq("status", 1)
+ .groupBy("line");
+
+ return this.list(wrapper);
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index d8d39e9..c1c52ec 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -737,8 +737,8 @@
jsonObject.append("currentCutTerritory", currentCutTerritorys);
//log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
//纾ㄨ竟淇℃伅
- List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo();
- jsonObject.append("edgTasks", edgTasks);
+// List<EdgGlassTaskInfo> edgTasks = edgGlassTaskInfoService.selectEdgInfo();
+// jsonObject.append("edgTasks", edgTasks);
//鍗у缂撳瓨绗煎唴淇℃伅
List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
@@ -764,7 +764,7 @@
@Scheduled(fixedDelay = 1000)
public void cacheGlassIsRun() {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勭（杈逛换鍔�
+ //姝ｅ湪杩涜鐨勪换鍔�
List<EdgGlassTaskInfo> taskCaches = edgGlassTaskInfoService.selectTaskCacheIsRun();
jsonObject.append("taskCaches", taskCaches);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
--
Gitblit v1.8.0