From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 10 九月 2024 17:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 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 239924e..bda6714 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
@@ -6,7 +6,9 @@
 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.result.SYS.TMonitorResult;
 import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.vo.UpdateOnlineVO;
 import com.ycl.platform.domain.vo.screen.MonitorRateVO;
 import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -137,5 +139,37 @@
      * @param list
      * @return
      */
-    int batchUpdateDeviceType(@Param("list") List<TMonitor> list);
+    int batchUpdateDeviceType(@Param("numbers") List<String> list,@Param("deviceType") Integer deviceType);
+
+    List<TMonitor> selectByNumbers(@Param("numbers")List<String> numbers);
+
+    /**
+     * 鍥芥爣鐮佹煡鍥芥爣鐮�
+     *
+     * @param gbList
+     * @return
+     */
+    List<String> getGBbyGB(@Param("gbList") List<String> gbList);
+
+    /**
+     * 鏌ュ嚭璁惧ip闆嗗悎
+     *
+     * @return
+     */
+    List<TMonitor> getDistinctIP();
+
+    /**
+     * 鏍规嵁ip淇敼鐐逛綅琛ㄧ殑鏄惁鍦ㄧ嚎瀛楁
+     * @param onlineList
+     */
+    void updateOnline(@Param("onlineList") List<UpdateOnlineVO> onlineList);
+
+
+    /**
+     * 鐐逛綅鍦ㄧ嚎鐜�
+     *
+     * @param tMonitor 璁惧璧勪骇
+     * @return 璁惧璧勪骇闆嗗悎
+     */
+    public List<TMonitorResult> selectMonitorResult(Short cameraFunType);
 }

--
Gitblit v1.8.0