From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
index e994f15..daaf6e3 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -1,11 +1,11 @@
package com.mes.taskcache.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.glassinfo.entity.GlassInfo;
+import com.github.yulichang.base.MPJBaseService;
import com.mes.taskcache.entity.TaskCache;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -15,24 +15,29 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface TaskCacheService extends IService<TaskCache> {
+public interface TaskCacheService extends MPJBaseService<TaskCache> {
- /**
- * 娣诲姞鐞嗙墖绗间换鍔�
- * @param taskCache
- * @return
- */
+
boolean insertTaskCache(TaskCache taskCache);
-
/**
* 鏌ヨ纾ㄨ竟浠诲姟
+ *
* @param line
* @return
*/
- List<TaskCache> selectEdgInfo(String line);
+ List<Map<String,Object>> selectEdgInfo(String line);
+
+ /**
+ * 鏌ヨ纾ㄨ竟浠诲姟
+ *
+ * @param line
+ * @return
+ */
+ TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes);
/**
* 鏌ヨ鐞嗙墖浠诲姟
+ *
* @return
*/
List<TaskCache> selectCacheInfo();
@@ -60,7 +65,7 @@
* @param line
* @return
*/
- List<TaskCache> selectLastOutCacheInfos(String line);
+ List<TaskCache> selectLastOutCacheInfos(int line);
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
@@ -68,5 +73,11 @@
* @return
*/
TaskCache selectLastOutCacheInfo(int line);
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ * @param
+ * @return
+ */
+ List<TaskCache> selectTaskCacheIsRun();
}
--
Gitblit v1.8.0