From 1d9f9bd9afb6e18aa73b456555256564e34b2acc Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 28 五月 2024 13:20:06 +0800
Subject: [PATCH] 卧式理片笼线程改造：1、优化任务查询，每次只获取第一条数据，避免任务表数据过多 2、玻璃尺寸限制改为配置
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 27 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 74d2904..9993519 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,20 +1,17 @@
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;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -23,42 +20,89 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- //娣诲姞鐞嗙墖绗间换鍔�
- @Override
- public boolean insertTaskCache(TaskCache taskCache){
- baseMapper.insert(taskCache);
- return true;
- }
- //鏌ヨ纾ㄨ竟浠诲姟
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ *
+ * @param line
+ * @return
+ */
@Override
public List<TaskCache> selectEdgInfo(String line) {
- return baseMapper.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));
}
- //鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+
@Override
- public List<TaskCache> selectCacheInfo(){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
+ public TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+ return baseMapper.queryGlassByTaskCache(line, taskTypes);
}
- //鏌ヨ鍏ㄩ儴浠诲姟
+
+ /**
+ * 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ *
+ * @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));
+ }
+
+ /**
+ * 鏌ヨ鍏ㄩ儴浠诲姟
+ *
+ * @return
+ */
@Override
public List<TaskCache> selectAll() {
return baseMapper.selectList(null);
}
- //鏌ヨ寰呰繘鐗囦换鍔�
+
+ /**
+ * 鏌ヨ寰呰繘鐗囦换鍔�
+ *
+ * @return
+ */
@Override
- public List<TaskCache> selectInputTaskCache(){
- return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
+ 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 QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
+ 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 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