From 5bc6d4839f68e60a27e381d5411c479bcf529056 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 01 八月 2024 16:13:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index deb0470..552305c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.vo.TMonitorVO;
 
@@ -12,7 +13,7 @@
  * @author ruoyi
  * @date 2024-03-04
  */
-public interface TMonitorMapper
+public interface TMonitorMapper extends BaseMapper<TMonitor>
 {
     /**
      * 鏌ヨ璁惧璧勪骇
@@ -64,10 +65,16 @@
 
     /**
      * 鑾峰彇瑙嗛缁熻
-     * @param cameraFunType 绫诲瀷
+     * @param tMonitor 鏉′欢
      * @return 缁熻鏁�
      */
-    Map<String, String> getVideoCount(String cameraFunType);
+    Map<String, String> getVideoCount(TMonitor tMonitor);
 
-    Map<String, String> recoveryException();
+    Map<String, String> recoveryException(String time);
+
+    /**
+     * 鑾峰彇鎭㈠寮傚父鎸佺画鍏虫敞璁惧
+     * @return 璁惧
+     */
+    List<TMonitorVO> selectRecoveryMonitor(String time);
 }

--
Gitblit v1.8.0