Ver código fonte

web页面实时流接口修改

gao.qiang 1 ano atrás
pai
commit
4724b4e2cf

+ 25 - 17
business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -309,23 +309,32 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
         List<String> pathList = new ArrayList<>();
         String data = HttpUtils.sendGet(webUrl + "/rtsp/api/list");
         if (StringUtils.isNotEmpty(data)) {
+            log.info("---------------data---"+data);
             JSONArray jsonArray = JSONArray.parseArray(data);
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject = jsonArray.getJSONObject(i);
-                String name = jsonObject.getString("Path");
-                pathList.add(name);
-            }
-            boolean contains = pathList.contains(cameraCode + "/" + channel);
-            if (contains) {
-                return getPlayFlv(cameraCode, channel, true);
-            } else {
-                /**
-                 *  jsonBody.put("cameraIndexCode", "01ea43e6676f4e47bd6c5cd9e02aa006");
-                 *         jsonBody.put("streamType", 0);
-                 *         jsonBody.put("protocol","rtsp");
-                 *         jsonBody.put("transmode", 1);
-                 *         jsonBody.put("expand","streamform=rtp");
-                 */
+            log.info("---------------jsonArray---"+jsonArray);
+            if (!ObjectUtils.isEmpty(jsonArray)) {
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    String name = jsonObject.getString("Path");
+                    pathList.add(name);
+                }
+                boolean contains = pathList.contains(cameraCode + "/" + channel);
+                if (contains) {
+                    return getPlayFlv(cameraCode, channel, true);
+                } else {
+                    /**
+                     *  jsonBody.put("cameraIndexCode", "01ea43e6676f4e47bd6c5cd9e02aa006");
+                     *         jsonBody.put("streamType", 0);
+                     *         jsonBody.put("protocol","rtsp");
+                     *         jsonBody.put("transmode", 1);
+                     *         jsonBody.put("expand","streamform=rtp");
+                     */
+                    CamerasVo camerasVo = new CamerasVo();
+                    camerasVo.setCameraIndexCode(cameraCode);
+                    previewURLs(camerasVo, channel);
+                    return getPlayFlv(cameraCode, channel, true);
+                }
+            }else {
                 CamerasVo camerasVo = new CamerasVo();
                 camerasVo.setCameraIndexCode(cameraCode);
                 previewURLs(camerasVo, channel);
@@ -337,7 +346,6 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
             previewURLs(camerasVo, channel);
             return getPlayFlv(cameraCode, channel, true);
         }
-//        return getPlayFlv(cameraCode, channel, true);
     }
 
     public static String invite(String cameraCode, String channel) {