From 97dfab42d2736e2e91035aad58ed01fc27ad3a7d Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 06 一月 2026 11:30:30 +0800
Subject: [PATCH] 大屏视频逻辑调整

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
index 80fb08e..33d8033 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/camera/impl/ApiPlayYdQlyService.java
@@ -77,8 +77,12 @@
         }
 
         //鎺ュ彛鑾峰彇鎾斁鍦板潃
-        String str = getPlayUrl(cameraMedia, apiCameraDto.getCameraId());
-        YdQlyDto dto = JSONObject.parseObject(str, YdQlyDto.class);
+        YdQlyResp resp = getPlayUrl(cameraMedia, apiCameraDto.getCameraId());
+
+        if(!"000000".equals(resp.getResultCode())){
+            return new ApiCameraResp(ApiCameraResp.CODE_ERROR, resp.getResultMsg());
+        }
+        YdQlyDto dto = JSONObject.parseObject(resp.getData(), YdQlyDto.class);
         if (null == dto || StringUtils.isBlank(dto.getUrl())) {
             return new ApiCameraResp(ApiCameraResp.CODE_ERROR, "鏈幏鍙栧埌鎽勫儚澶存挱鏀惧湴鍧�锛�");
         }
@@ -219,7 +223,7 @@
      * @param cameraId
      * @return
      */
-    private String getPlayUrl(CameraMedia cameraMedia, String cameraId) {
+    private YdQlyResp getPlayUrl(CameraMedia cameraMedia, String cameraId) {
         try {
 
             String timestamp = String.valueOf(System.currentTimeMillis());
@@ -259,10 +263,8 @@
             String response = HttpUtils.doPost(URL_PLAY_LIVE, herderParams, requestBodyStr);
 
             YdQlyResp ydQlyResp = JSONObject.parseObject(response, YdQlyResp.class);
-            if(!"000000".equals(ydQlyResp.getResultCode())){
-                return null;
-            }
-            return ydQlyResp.getData();
+
+            return ydQlyResp;
         } catch (Exception e) {
             return null;
         }
@@ -326,7 +328,7 @@
     }
 
 
-    private static final String TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJwcm9mZXNzaW9uIjoxLCJhcHBpZCI6ImUwYTFhNDIwZjU1YTRmOWRiYTBkNjM4MmRmNTlkYjY2Iiwib3BlcmF0b3JUeXBlIjoxLCJvcGVyYXRvciI6ImUwYTFhNDIwZjU1YTRmOWRiYTBkNjM4MmRmNTlkYjY2IiwianRpIjoiMjE4NzE3MDI2MDQyNDk2MjA3NCIsImlhdCI6MTc2NzUxODIxNiwic3ViIjoiZTBhMWE0MjBmNTVhNGY5ZGJhMGQ2MzgyZGY1OWRiNjYiLCJleHAiOjE3NjgxMjMwMTZ9.FGYq1TzTUHBpv3xEk6DpMfo_SrEZEK_zPkBYsmrTly4";
+    private static final String TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJwcm9mZXNzaW9uIjoxLCJhcHBpZCI6ImUwYTFhNDIwZjU1YTRmOWRiYTBkNjM4MmRmNTlkYjY2Iiwib3BlcmF0b3JUeXBlIjoxLCJvcGVyYXRvciI6ImUwYTFhNDIwZjU1YTRmOWRiYTBkNjM4MmRmNTlkYjY2IiwianRpIjoiMjE4Nzk0MzMzMTE4NDM1NzM4NyIsImlhdCI6MTc2NzYxMDM3Mywic3ViIjoiZTBhMWE0MjBmNTVhNGY5ZGJhMGQ2MzgyZGY1OWRiNjYiLCJleHAiOjE3NjgyMTUxNzN9.Tot-yYsNLbY9YH2AYgV_Fggb7PCNrUR0PDi0Ear1s5w";
     private static final String APP_ID = "e0a1a420f55a4f9dba0d6382df59db66";
     private static final String SECRET = "OuLsvFL9nqxeeltu";
     private static final String URL = "https://open.qly.cmviot.cn/v3/open/api/token";

--
Gitblit v1.9.3