From 26e9d2d7953bcb8eecaa9f7ce0527abf64f73d0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 10:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 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 6245c2d..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,20 +1,23 @@
 package com.ycl.platform.mapper;
 
-import com.ycl.platform.entity.TMonitor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 璁惧璧勪骇Mapper鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2024-03-04
  */
-public interface TMonitorMapper 
+public interface TMonitorMapper extends BaseMapper<TMonitor>
 {
     /**
      * 鏌ヨ璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 璁惧璧勪骇
      */
@@ -22,15 +25,15 @@
 
     /**
      * 鏌ヨ璁惧璧勪骇鍒楄〃
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇闆嗗悎
      */
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
+    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
 
     /**
      * 鏂板璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -38,7 +41,7 @@
 
     /**
      * 淇敼璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -46,7 +49,7 @@
 
     /**
      * 鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 缁撴灉
      */
@@ -54,9 +57,24 @@
 
     /**
      * 鎵归噺鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
      * @return 缁撴灉
      */
     public int deleteTMonitorByIds(Long[] ids);
+
+    /**
+     * 鑾峰彇瑙嗛缁熻
+     * @param tMonitor 鏉′欢
+     * @return 缁熻鏁�
+     */
+    Map<String, String> getVideoCount(TMonitor tMonitor);
+
+    Map<String, String> recoveryException(String time);
+
+    /**
+     * 鑾峰彇鎭㈠寮傚父鎸佺画鍏虫敞璁惧
+     * @return 璁惧
+     */
+    List<TMonitorVO> selectRecoveryMonitor(String time);
 }

--
Gitblit v1.8.0