修改导出

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -166,7 +166,7 @@ public class CameraUtil {
             return wsUrl + "/ws/" + channel + "/" + cameraCode ;
         }
         if (!flay) {
-            return bakUrl + "/hdl/" + channel + "/" + cameraCode ;
+            return webUrl + "/hdl/" + channel + "/" + cameraCode ;
         }
         return webUrl + "/hdl/" + channel + "/" + cameraCode ;
     }
@@ -494,9 +494,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public static String getRecordUrl(String cameraCode, String channel, Date startTm, Date endTm) {
         String result = null;
-        String url = webUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000;
+        log.info(bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000);
+        String url = bakUrl + "/gb28181/api/invite?id=" + cameraCode + "&channel=" + channel + "&startTime=" + startTm.getTime()/1000 + "&endTime=" + endTm.getTime()/1000;
         try {
             result = HttpClientUtil.get(url);
+            log.info("-----getRecordUrl-----"+result);
             if (result.equals("200")) {
                 String path = apiSummary(cameraCode + "/" + channel+"/"+startTm.getTime()/1000+"-"+endTm.getTime()/1000);
                 if (StringUtils.isNotEmpty(path)){
@@ -518,13 +520,14 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      * @return
      */
     public static String apiSummary(String path) {
+        log.info("---------apiSummary-----"+path);
         int maxRetries = 5;
         int retryCount = 0;
         boolean success = false;
         JSONArray streamArray = null;
         while (!success && retryCount < maxRetries) {
             try {
-                String data = HttpClientUtil.gets(webUrl + "/api/summary");
+                String data = HttpClientUtil.gets(bakUrl + "/api/summary");
                 log.info("data------------------>" + data);
                 if (StringUtils.isNotEmpty(data)) {
                     JSONObject jsonObject = JSONObject.parseObject(data);
@@ -537,13 +540,16 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
                 retryCount++;
             }
         }
+        log.info("---------streamArray-----"+streamArray);
         if (!ObjectUtils.isEmpty(streamArray)) {
             for (int i = 0; i < streamArray.size(); i++) {
                 JSONObject subObj = streamArray.getJSONObject(i);
                 String streamPath = subObj.getString("StreamPath");
+                log.info("---------streamPath-----"+streamPath);
                 if (streamPath.equals(path)) {
                     //取出VideoTracks
                     JSONArray videoJson = subObj.getJSONArray("VideoTracks");
+                    log.info("---------videoJson-----"+videoJson);
                     if (videoJson != null && videoJson.size() > 0) {
                         return wsUrl + "/ws/" + streamPath;
                     }

hazard-admin/src/main/resources/application.yml

@@ -21,7 +21,7 @@ base:
   ffmpegPath: /usr/local/ffmpeg/bin/ffmpeg
   filePath: /opt/streams/record/flv/
   webUrl: http://183.236.39.220:8083
-  bakUrl: http://183.236.39.220:8083
+  bakUrl: http://10.161.12.50:9080
   wsUrl: ws://183.236.39.220:8083
   defaultPassword: yn5aq5Mt.106.tky
   imgUrl: http://10.161.12.52:18801/picbucket

hazard-sdk/src/main/resources/application.yml

@@ -17,7 +17,7 @@ base:
   captchaType: math
   #图片路径前缀
   imgUrl: http://183.236.39.220:18801/picbucket
-  webUrl: http://183.236.39.220:8083
+  webUrl: http://10.161.12.50:9080
   wsUrl: ws://183.236.39.220:8083
   recordUrl: http://183.236.39.220:18082