From d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e Mon Sep 17 00:00:00 2001 From: 648540858 <456panlinlin> Date: 星期四, 21 四月 2022 10:30:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into map --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java index 11d8b84..d57f812 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java @@ -180,7 +180,7 @@ * @param count * @return */ - PageInfo querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, String online, int page, int count); + PageInfo querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, Boolean online, int page, int count); /** @@ -401,10 +401,9 @@ * 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃 * @param id 濯掍綋ID * @param enable 鍚敤/涓嶅惎鐢� - * @param status 鐘舵�� * @return */ - List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable, boolean status); + List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable); /** * 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶� -- Gitblit v1.8.0