From 633b96bb1ced95e60df5e28249ce51b6ffe82d27 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 17:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |   92 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 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..6e66a2a 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,32 @@
 package com.ycl.platform.mapper;
 
-import com.ycl.platform.entity.TMonitor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.query.DataCenterQuery;
+import com.ycl.platform.domain.query.HomeQuery;
+import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.vo.screen.MonitorRateVO;
+import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 璁惧璧勪骇Mapper鎺ュ彛
- * 
+ *
  * @author ruoyi
  * @date 2024-03-04
  */
-public interface TMonitorMapper 
+@Mapper
+public interface TMonitorMapper extends BaseMapper<TMonitor>
 {
     /**
      * 鏌ヨ璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 璁惧璧勪骇
      */
@@ -22,15 +34,22 @@
 
     /**
      * 鏌ヨ璁惧璧勪骇鍒楄〃
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇闆嗗悎
      */
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor);
+    public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor);
 
     /**
+     * 鏌ヨ璁惧璧勪骇鍒楄〃
+     *
+     * @param tMonitor 璁惧璧勪骇
+     * @return 璁惧璧勪骇闆嗗悎
+     */
+    public List<TMonitorVO> selectMonitorVOList();
+    /**
      * 鏂板璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -38,7 +57,7 @@
 
     /**
      * 淇敼璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -46,7 +65,7 @@
 
     /**
      * 鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 缁撴灉
      */
@@ -54,9 +73,62 @@
 
     /**
      * 鎵归噺鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
      * @return 缁撴灉
      */
     public int deleteTMonitorByIds(Long[] ids);
+
+    /**
+     * 鑾峰彇瑙嗛缁熻
+     * @param tMonitor 鏉′欢
+     * @return 缁熻鏁�
+     */
+    Map<String, String> getVideoCount(TMonitor tMonitor);
+
+    /**
+     * 鑾峰彇鎭㈠寮傚父璁惧
+     * @param time 鏃堕棿
+     * @return 鏁版嵁
+     */
+    Map<String, String> recoveryException(String time);
+
+    /**
+     * 鑾峰彇鎭㈠寮傚父鎸佺画鍏虫敞璁惧
+     * @return 璁惧
+     */
+    List<TMonitorVO> selectRecoveryMonitor(String time);
+
+    /**
+     * 棣栭〉鎶樼嚎鍥�
+     * @param monitorQuery 鏌ヨ鏉′欢
+     * @return 鏁版嵁
+     */
+    List<Map<String, Object>> home(HomeQuery monitorQuery);
+
+    List<TMonitorVO> selectListByIds(List<String> list);
+
+    /**
+     * 澶у睆璁惧鎬绘暟
+     * @param dashboardQuery 鏌ヨ鏉′欢
+     * @return 鏁版嵁
+     */
+    List<MonitorTotalVO> monitorTotal(DashboardQuery dashboardQuery);
+
+    /**
+     * 澶у睆璁惧姝ｅ父鐜�
+     * @return 鏁版嵁
+     */
+    List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery);
+
+    /**
+     * 鏁版嵁涓績-璧勪骇绠＄悊
+     *
+     * @param query
+     */
+    IPage assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
+
+
+    void deleteAll();
+
 }

--
Gitblit v1.8.0