From cba52c6212d57640a477b3529e6b6206d5d2300a Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Sat, 22 Mar 2025 10:32:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yg/df/service/BsSgcDfSpPlayService.java   | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
index b3053d56..62597f1f 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java
@@ -93,7 +93,7 @@ public class BsSgcDfSpPlayService {
             // 2. 获取令牌
             String spOauthTokenUrlJson = getToken(dto);
             JSONObject tokenJson = parseJson(spOauthTokenUrlJson);
-            if (tokenJson == null || !isSuccess(tokenJson)) {
+            if (!isSuccess(tokenJson)) {
                 return rest;
             }
             JSONObject tokenData = tokenJson.getJSONObject("data");
@@ -149,31 +149,19 @@ public class BsSgcDfSpPlayService {
         return JSONObject.parseObject(json);
     }
 
-    /**
-     * 解析 JSON 字符串为 JSONArray
-     */
-    private JSONArray parseJsonArray(Object obj) {
-        if (obj == null) {
-            return null;
-        }
-        return JSON.parseArray(obj.toString());
-    }
-
     /**
      * 判断接口响应是否成功
      */
     private boolean isSuccess(JSONObject json) {
-        return json != null && Objects.equals(200, json.getIntValue("code"));
+        return json != null && Objects.equals(0, json.getIntValue("code"));
     }
 
     public String getSpPlayUrls(DfSpPlayQueDto dto) {
-        HttpHeaders headers = new HttpHeaders();
         Map<String, String> uriVariables = new HashMap<>();
         MultiValueMap<String, String> headValues = new LinkedMultiValueMap<>();
         headValues.put("token", Collections.singletonList(dto.getToken()));
         Map<String, String> paramMap = new HashMap<>();
         paramMap.put("cameraId", dto.getCameraId());
-        headers.setContentType(MediaType.APPLICATION_JSON);
         String seqResult2 = null;
         try {
             seqResult2 = RestTemplateUtil.postForObjectWithHead(paramMap, headValues, videoUrl + SP_PLAY_URL, String.class, uriVariables);
@@ -187,12 +175,11 @@ public class BsSgcDfSpPlayService {
     public String getToken(DfSpPlayQueDto dto) {
         dto.setMobile(videoPhone);
         RestTemplate restTemplate = new RestTemplate();
-        String token = null;
         String requestStr = JSONObject.toJSONString(dto);
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         HttpEntity<String> httpEntity = new HttpEntity<>(requestStr, headers);
-        String seqResult = "";
+        String seqResult;
         try {
             ResponseEntity<String> responseEntity = restTemplate.exchange(videoUrl + OAUTH_TOKEN, HttpMethod.POST, httpEntity, String.class);
             seqResult = responseEntity.getBody();
@@ -200,6 +187,6 @@ public class BsSgcDfSpPlayService {
         } catch (Exception e) {
             log.warn("请求接口OAUTH_TOKEN返回异常: {}", e.getMessage());
         }
-        return token;
+        return null;
     }
 }