From e0699feb382ad3c01040f135f53698ac5c6ec84e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 10:42:24 +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 | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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 aec4976..73efed6 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,16 +1,20 @@
package com.mes.taskcache.service.impl;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.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;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -19,45 +23,46 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
+ @Autowired
+ TaskCacheMapper taskCacheMapper;
//娣诲姞鐞嗙墖绗间换鍔�
@Override
- public boolean insertTaskCache() {
- return false;
+ public boolean insertTaskCache(TaskCache taskCache){
+ taskCacheMapper.insert(taskCache);
+ return true;
}
-
//鏌ヨ纾ㄨ竟浠诲姟
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return null;
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
}
-
- //鏌ヨ鐞嗙墖浠诲姟
+ //鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
@Override
- public List<TaskCache> selectCacheInfo() {
- return null;
+ public List<TaskCache> selectCacheInfo(){
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
}
-
//鏌ヨ鍏ㄩ儴浠诲姟
@Override
public List<TaskCache> selectAll() {
- return null;
+ return taskCacheMapper.selectList(null);
+ }
+ //鏌ヨ寰呰繘鐗囦换鍔�
+ @Override
+ public List<TaskCache> selectInputTaskCache(){
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
}
- //鏌ヨ杩涚墖浠诲姟
+ //鏌ヨ寰呭嚭鐗囦换鍔�
@Override
- public List<TaskCache> selectInputTaskCache() {
- return null;
- }
-
- //鏌ヨ鍑虹墖浠诲姟
- @Override
- public List<TaskCache> selectOutTaskCache() {
- return null;
+ public List<TaskCache> selectOutTaskCache(){
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
}
//鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
@Override
- public boolean selectLastOutCacheInfo() {
- return false;
+ public List<TaskCache> selectLastOutCacheInfo(String line){
+ return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
}
}
--
Gitblit v1.8.0