From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 88 ++++++++++++++++++++++++++++++++------------
1 files changed, 64 insertions(+), 24 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 73efed6..486eb8a 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
@@ -1,13 +1,10 @@
package com.mes.taskcache.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.glassinfo.entity.GlassInfo;
-import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.taskcache.entity.TaskCache;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -23,46 +20,89 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- @Autowired
- GlassInfoMapper glassInfoMapper;
- @Autowired
- TaskCacheMapper taskCacheMapper;
- //娣诲姞鐞嗙墖绗间换鍔�
+
+ /**
+ * 娣诲姞鐞嗙墖绗间换鍔�
+ * @param taskCache
+ * @return
+ */
@Override
public boolean insertTaskCache(TaskCache taskCache){
- taskCacheMapper.insert(taskCache);
+ baseMapper.insert(taskCache);
return true;
}
- //鏌ヨ纾ㄨ竟浠诲姟
+
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ * @param line
+ * @return
+ */
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line));
+// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
}
- //鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+
+ /**
+ * 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ * @return
+ */
@Override
public List<TaskCache> selectCacheInfo(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
+// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
}
- //鏌ヨ鍏ㄩ儴浠诲姟
+
+ /**
+ * 鏌ヨ鍏ㄩ儴浠诲姟
+ * @return
+ */
@Override
public List<TaskCache> selectAll() {
- return taskCacheMapper.selectList(null);
+ return baseMapper.selectList(null);
}
- //鏌ヨ寰呰繘鐗囦换鍔�
+
+ /**
+ * 鏌ヨ寰呰繘鐗囦换鍔�
+ * @return
+ */
@Override
public List<TaskCache> selectInputTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1));
+
+// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
}
- //鏌ヨ寰呭嚭鐗囦换鍔�
+ /**
+ * 鏌ヨ寰呭嚭鐗囦换鍔�
+ * @return
+ */
@Override
public List<TaskCache> selectOutTaskCache(){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2));
+// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
}
- //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
@Override
- public List<TaskCache> selectLastOutCacheInfo(String line){
- return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
+ public List<TaskCache> selectLastOutCacheInfos(int line){
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
}
+
+ /**
+ * 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ * @param line
+ * @return
+ */
+ @Override
+ public TaskCache selectLastOutCacheInfo(String line){
+ return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+ }
+
+
}
--
Gitblit v1.8.0