From bfd8d1698372fbedd96b1badfa68c9d3649c2fa9 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 14 六月 2024 11:28:58 +0800
Subject: [PATCH] 拉取最新代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 7def8da..fbd5156 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -59,6 +60,7 @@
.orderByAsc(TaskCache::getCreateTime));
List<Map<String,Object>> result=new ArrayList<>();
int serialNumber=1;
+ List<Map<String,Object>> a=taskCache.stream().filter(t->t.getTaskStatus()==1).collect(Collectors.toList());
for(TaskCache taskCache1:taskCache){
Map<String,Object> map=new HashMap<>();
GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
@@ -84,6 +86,11 @@
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
}
+ @Override
+ public TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+ return baseMapper.queryGlassByTaskCache(line, taskTypes);
+ }
+
/**
* 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
* @return
--
Gitblit v1.8.0