|
@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
import cn.hutool.poi.excel.ExcelReader;
|
|
|
import cn.hutool.poi.excel.ExcelUtil;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
@@ -19,15 +20,13 @@ import com.huimv.guowei.admin.mapper.SysCameraBrandMapper;
|
|
|
import com.huimv.guowei.admin.mapper.SysCameraMapper;
|
|
|
import com.huimv.guowei.admin.service.ISysCameraService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.huimv.guowei.admin.utils.ProcessUtil;
|
|
|
import javafx.scene.Camera;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.LinkedList;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -92,7 +91,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List getCameraDetails(CameraListsVo cameraListsVo) {
|
|
|
+ public List getCameraDetails(CameraListsVo cameraListsVo) throws InterruptedException {
|
|
|
List<Integer> cameraIds = cameraListsVo.getCameraIds();
|
|
|
CameraListVo cameraListVo = new CameraListsVo();
|
|
|
cameraListVo.setCurrent(1);
|
|
@@ -138,7 +137,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
|
|
|
cameraVo.setRtspUrl("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp);
|
|
|
|
|
|
cameraVo.setCameraName(cameraName);
|
|
|
- cameraVo.setHttpUrl(handleHlsHttpUrl(url, cameraAccount, cameraPassword, camerIp, farmAppPort, farmVideoApp, hlsMediaPort));
|
|
|
+ cameraVo.setHttpUrl(("rtsp://" + cameraAccount + ":" + cameraPassword + "@" + camerIp + rtsp));
|
|
|
if (i > 0) {
|
|
|
cameraVo.setLastId(list.get(i - 1).getId());
|
|
|
}
|
|
@@ -153,6 +152,34 @@ 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(":"));
|