小程序1

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraServiceImpl.java

@@ -137,7 +137,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
                     cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
 
                     cameraVo.setCameraName(cameraName);
-                    cameraVo.setHttpUrl(("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp));
+                    cameraVo.setHttpUrl(handleHlsHttpUrl(url,cameraAccount,cameraPassword,camerIp,farmAppPort,farmVideoApp,hlsMediaPort));
                     if (i > 0) {
                         cameraVo.setLastId(list.get(i - 1).getId());
                     }
@@ -152,34 +152,6 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         return cameraDetailsList;
     }
 
-  /*  public String HlsHttp(String url) throws InterruptedException {
-        String name = generateByShuffle();
-        System.out.println(name);
-        String input = url;
-        String output = "/usr/local/nginx/html/hls/" + name + ".m3u8";
-        List<String> command = new ArrayList<>();
-        command.add("ffmpeg");
-        command.add("-i");
-        command.add(input);
-        command.add("-c:v");
-        command.add("copy");
-        command.add("-c:a");
-        command.add("copy");
-        command.add("-f");
-        command.add("ssegment");
-        command.add("-segment_format");
-        command.add("mpegts");
-        command.add("-segment_list");
-        command.add(output);
-        command.add("-segment_time");
-        command.add("10");
-        command.add("/usr/local/nginx/html/hls/" + name + "%05d.ts");//
-        System.out.println(command);
-        String result = ProcessUtil.execute(command);
-        Thread.sleep(10000);
-        return "http://192.168.1.68:80" + "/hls/" + name + ".m3u8";
-    }*/
-
     //构造HlsHttp地址
     private String handleHlsHttpUrl(String url, String cameraAccount, String cameraPassword, String camerIp, String farmAppPort, String farmVideoApp, String hlsMediaPort) {
         url = url.substring(0, url.indexOf(":"));