From f5abf8df4c05439a288a88dedad0f7065901ca21 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 19 Jun 2024 16:00:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/CloudRecordServiceMapper.java         |  2 +-
 .../vmp/web/gb28181/ApiStreamController.java  | 32 ++++++++++++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
index b446148a..f641071a 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java
@@ -53,7 +53,7 @@ public interface CloudRecordServiceMapper {
             " <if test= 'ids != null  ' > and id in " +
             " <foreach collection='ids'  item='item'  open='(' separator=',' close=')' > #{item}</foreach>" +
             " </if>" +
-            " order by start_time DESC" +
+            " order by start_time ASC" +
             " </script>")
     List<CloudRecordItem> getList(@Param("query") String query, @Param("app") String app, @Param("stream") String stream,
                                   @Param("startTimeStamp")Long startTimeStamp, @Param("endTimeStamp")Long endTimeStamp,
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 4f42efd1..1d1919a6 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -120,22 +120,38 @@ public class ApiStreamController {
             if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
                 if (data != null) {
                     StreamInfo streamInfo = (StreamInfo)data;
-                    if (streamInfo.getTranscodeStream() != null) {
-                        streamInfo = streamInfo.getTranscodeStream();
-                    }
                     JSONObject resultJjson = new JSONObject();
                     resultJjson.put("StreamID", streamInfo.getStream());
                     resultJjson.put("DeviceID", serial);
                     resultJjson.put("ChannelID", code);
                     resultJjson.put("ChannelName", deviceChannel.getName());
                     resultJjson.put("ChannelCustomName", "");
-                    resultJjson.put("FLV", streamInfo.getFlv().getUrl());
-                    if(streamInfo.getHttps_flv() != null) {
-                        resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+                    if (streamInfo.getTranscodeStream() != null) {
+                        resultJjson.put("FLV", streamInfo.getTranscodeStream().getFlv().getUrl());
+                    }else {
+                        resultJjson.put("FLV", streamInfo.getFlv().getUrl());
+
                     }
-                    resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+                    if(streamInfo.getHttps_flv() != null) {
+                        if (streamInfo.getTranscodeStream() != null) {
+                            resultJjson.put("HTTPS_FLV", streamInfo.getTranscodeStream().getHttps_flv().getUrl());
+                        }else {
+                            resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
+                        }
+                    }
+
+                    if (streamInfo.getTranscodeStream() != null) {
+                        resultJjson.put("WS_FLV", streamInfo.getTranscodeStream().getWs_flv().getUrl());
+                    }else {
+                        resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
+                    }
+
                     if(streamInfo.getWss_flv() != null) {
-                        resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+                        if (streamInfo.getTranscodeStream() != null) {
+                            resultJjson.put("WSS_FLV", streamInfo.getTranscodeStream().getWss_flv().getUrl());
+                        }else {
+                            resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
+                        }
                     }
                     resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
                     if (streamInfo.getRtmps() != null) {