From 4446218f9e051160ebec51cad3e9c321f170e72b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 二月 2023 15:21:41 +0800
Subject: [PATCH] 修复通道导入bug

---
 src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java  |    2 
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java       |    2 
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java |    7 +--
 src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java         |   53 ++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
index b98f188..6540e3e 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
@@ -366,7 +366,7 @@
         // 瀛樺偍鏁版嵁鍒皊tream_push琛�
         streamPushMapper.addAll(streamPushItems);
         List<StreamPushItem> streamPushItemForGbStream = streamPushItems.stream()
-                .filter(streamPushItem-> streamPushItem.getId() != null)
+                .filter(streamPushItem-> streamPushItem.getGbId() != null)
                 .collect(Collectors.toList());
         // 瀛樺偍鏁版嵁鍒癵b_stream琛紝 id浼氳繑鍥炲埌streamPushItemForGbStream閲�
         if (streamPushItemForGbStream.size() > 0) {
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 0b0a7d9..938f669 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -56,7 +56,7 @@
 	 * @param count 姣忛〉鏁伴噺
 	 * @return
 	 */
-	public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
+	public PageInfo<DeviceChannel> queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
 	
 	public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds);
 
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
index e7c24aa..e577baa 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
@@ -1,43 +1,96 @@
 package com.genersoft.iot.vmp.vmanager.bean;
 
 import com.genersoft.iot.vmp.common.StreamInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(description = "娴佷俊鎭�")
 public class StreamContent {
 
+    @Schema(description = "搴旂敤鍚�")
     private String app;
+
+    @Schema(description = "娴両D")
     private String stream;
 
+    @Schema(description = "IP")
     private String ip;
 
+    @Schema(description = "HTTP-FLV娴佸湴鍧�")
     private String flv;
 
+    @Schema(description = "HTTPS-FLV娴佸湴鍧�")
     private String https_flv;
+
+    @Schema(description = "Websocket-FLV娴佸湴鍧�")
     private String ws_flv;
+
+    @Schema(description = "Websockets-FLV娴佸湴鍧�")
     private String wss_flv;
+
+    @Schema(description = "HTTP-FMP4娴佸湴鍧�")
     private String fmp4;
+
+    @Schema(description = "HTTPS-FMP4娴佸湴鍧�")
     private String https_fmp4;
+
+    @Schema(description = "Websocket-FMP4娴佸湴鍧�")
     private String ws_fmp4;
+
+    @Schema(description = "Websockets-FMP4娴佸湴鍧�")
     private String wss_fmp4;
+
+    @Schema(description = "HLS娴佸湴鍧�")
     private String hls;
+
+    @Schema(description = "HTTPS-HLS娴佸湴鍧�")
     private String https_hls;
+
+    @Schema(description = "Websocket-HLS娴佸湴鍧�")
     private String ws_hls;
+
+    @Schema(description = "Websockets-HLS娴佸湴鍧�")
     private String wss_hls;
+
+    @Schema(description = "HTTP-TS娴佸湴鍧�")
     private String ts;
+
+    @Schema(description = "HTTPS-TS娴佸湴鍧�")
     private String https_ts;
+
+    @Schema(description = "Websocket-TS娴佸湴鍧�")
     private String ws_ts;
+
+    @Schema(description = "Websockets-TS娴佸湴鍧�")
     private String wss_ts;
+
+    @Schema(description = "RTMP娴佸湴鍧�")
     private String rtmp;
+
+    @Schema(description = "RTMPS娴佸湴鍧�")
     private String rtmps;
+
+    @Schema(description = "RTSP娴佸湴鍧�")
     private String rtsp;
+
+    @Schema(description = "RTSPS娴佸湴鍧�")
     private String rtsps;
+
+    @Schema(description = "RTC娴佸湴鍧�")
     private String rtc;
 
+    @Schema(description = "RTCS娴佸湴鍧�")
     private String rtcs;
+
+    @Schema(description = "娴佸獟浣揑D")
     private String mediaServerId;
+
+    @Schema(description = "娴佺紪鐮佷俊鎭�")
     private Object tracks;
 
+    @Schema(description = "寮�濮嬫椂闂�")
     private String startTime;
 
+    @Schema(description = "缁撴潫鏃堕棿")
     private String endTime;
 
     private double progress;
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 11bc621..c15d771 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -123,7 +123,7 @@
 	@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
 	@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
 	@Parameter(name = "catalogUnderDevice", description = "鏄惁鐩村睘涓庤澶囩殑鐩綍")
-	public PageInfo channels(@PathVariable String deviceId,
+	public PageInfo<DeviceChannel> channels(@PathVariable String deviceId,
 											   int page, int count,
 											   @RequestParam(required = false) String query,
 											   @RequestParam(required = false) Boolean online,
@@ -223,7 +223,7 @@
 	@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
 	@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
 	@GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
-	public PageInfo subChannels(@PathVariable String deviceId,
+	public PageInfo<DeviceChannel> subChannels(@PathVariable String deviceId,
 												  @PathVariable String channelId,
 												  int page,
 												  int count,
@@ -237,8 +237,7 @@
 			return deviceChannelPageResult;
 		}
 
-		PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
-		return pageResult;
+		return storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
 	}
 
 	/**

--
Gitblit v1.8.0