From 4d8089f35b577dda064345b6323838649bc99576 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 五月 2024 10:12:42 +0800
Subject: [PATCH] 1、上片机修改读写PLC方式 2、修改卧式理片ip地址

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java |   95 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 69 insertions(+), 26 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 811698b..2398039 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,7 +1,8 @@
 package com.mes.taskcache.service.impl;
 
-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.stereotype.Service;
@@ -10,7 +11,7 @@
 
 /**
  * <p>
- *  鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
  * </p>
  *
  * @author zhoush
@@ -19,42 +20,84 @@
 @Service
 public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
 
-    //娣诲姞鐞嗙墖绗间换鍔�
-    @Override
-    public boolean insertTaskCache(){
-        return false;
-    }
-
-    //鏌ヨ纾ㄨ竟浠诲姟
+    /**
+     * 鏌ヨ纾ㄨ竟浠诲姟
+     *
+     * @param line
+     * @return
+     */
     @Override
     public List<TaskCache> selectEdgInfo(String line) {
-        return null;
+        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 null;
+    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));
     }
-    //鏌ヨ鍏ㄩ儴浠诲姟
+
+    /**
+     * 鏌ヨ鍏ㄩ儴浠诲姟
+     *
+     * @return
+     */
     @Override
     public List<TaskCache> selectAll() {
-        return null;
-    }
-    //鏌ヨ杩涚墖浠诲姟
-    @Override
-    public List<TaskCache> selectInputTaskCache(){
-        return null;
+        return baseMapper.selectList(null);
     }
 
-    //鏌ヨ鍑虹墖浠诲姟
+    /**
+     * 鏌ヨ寰呰繘鐗囦换鍔�
+     *
+     * @return
+     */
     @Override
-    public List<TaskCache> selectOutTaskCache(){
-        return null;
+    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));
     }
 
-    //鏌ヨ  A09  鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+    /**
+     * 鏌ヨ寰呭嚭鐗囦换鍔�
+     *
+     * @return
+     */
     @Override
-    public boolean selectLastOutCacheInfo(){
-        return false;
+    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 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+     *
+     * @param line
+     * @return
+     */
+    @Override
+    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