From 4725595ed0d3684bde0efbe45889482b46bc6fb0 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 16:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 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..6560f03 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,11 +1,10 @@
package com.mes.taskcache.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 org.springframework.beans.factory.annotation.Autowired;
@@ -23,38 +22,71 @@
*/
@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 QueryWrapper<TaskCache>().eq("end_cell",line));
}
- //鏌ヨ鐞嗙墖浠诲姟
+ /**
+ * 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ * @return
+ */
+ @Override
public List<TaskCache> selectCacheInfo(){
-
+ 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 QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
}
- //鏌ヨ鍑虹墖浠诲姟
+ /**
+ * 鏌ヨ寰呭嚭鐗囦换鍔�
+ * @return
+ */
+ @Override
public List<TaskCache> selectOutTaskCache(){
-
+ 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 QueryWrapper<TaskCache>().eq("end_xxxxcell",line).eq("task_status",1).orderByDesc("ID"));
}
}
--
Gitblit v1.8.0