From e5e576ab6840b8030a60a1e67fb94728f7ec2ae2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 24 四月 2024 16:27:03 +0800
Subject: [PATCH] Changes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java |   75 +++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 17 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 0fc6b8b..ffa237c 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,15 @@
 package com.mes.taskcache.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.query.MPJLambdaQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.mes.glassinfo.entity.GlassInfo;
 import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.glassinfo.service.GlassInfoService;
 import com.mes.taskcache.entity.TaskCache;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.taskcache.mapper.TaskCacheMapper;
 import com.mes.taskcache.service.TaskCacheService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,38 +25,77 @@
  */
 @Service
 public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
-    //娣诲姞鐞嗙墖绗间换鍔�
+
+    /**
+     * 娣诲姞鐞嗙墖绗间换鍔�
+     * @param taskCache
+     * @return
+     */
+    @Override
     public boolean insertTaskCache(TaskCache taskCache){
-        return this.save(taskCache);
+        baseMapper.insert(taskCache);
+        return true;
     }
 
-    //鏌ヨ纾ㄨ竟浠诲姟
-    public List<TaskCache> selectEdgInfo(String line){
-
+    /**
+     * 鏌ヨ纾ㄨ竟浠诲姟
+     * @param line
+     * @return
+     */
+    @Override
+    public List<TaskCache> selectEdgInfo(String 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 baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
+//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
     }
 
-    //鏌ヨ鍏ㄩ儴浠诲姟
-    public List<TaskCache> selectAll(){
-
+    /**
+     * 鏌ヨ鍏ㄩ儴浠诲姟
+     * @return
+     */
+    @Override
+    public List<TaskCache> selectAll() {
+        return baseMapper.selectList(null);
     }
 
-    //鏌ヨ杩涚墖浠诲姟
+    /**
+     * 鏌ヨ寰呰繘鐗囦换鍔�
+     * @return
+     */
+    @Override
     public List<TaskCache> selectInputTaskCache(){
+        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 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 baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getID));
+//        return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
     }
 }

--
Gitblit v1.8.0