From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
index 9499b45..be8810d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
@@ -1,7 +1,12 @@
 package com.mes.opctask.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
 import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * (EdgStorageDeviceTaskHistory)琛ㄦ暟鎹簱璁块棶灞�
@@ -11,5 +16,8 @@
  */
 public interface EdgStorageDeviceTaskHistoryMapper extends BaseMapper<EdgStorageDeviceTaskHistory> {
 
+    DailyProductionVO queryEdgDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("deviceId") Integer deviceId);
+
+    List<RunTime> queryRunTimes();
 }
 

--
Gitblit v1.8.0