|
|
@@ -171,7 +171,7 @@ public class CameraUtil {
|
|
|
* @return
|
|
|
*/
|
|
|
public static String startRecording(String cameraCode, String channel) {
|
|
|
- return bakUrl + "/recordpro/api/start?streamPath=" + channel + "/" + cameraCode;
|
|
|
+ return webUrl + "/recordpro/api/start?streamPath=" + channel + "/" + cameraCode;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -181,7 +181,7 @@ public class CameraUtil {
|
|
|
* @return
|
|
|
*/
|
|
|
public static String endRecording(String cameraCode, String channel) {
|
|
|
- return bakUrl + "/recordpro/api/stop?id=" + cameraCode + "/" + channel + "/flv";
|
|
|
+ return webUrl + "/recordpro/api/stop?id=" + cameraCode + "/" + channel + "/flv";
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -236,7 +236,7 @@ public class CameraUtil {
|
|
|
String endTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endTm);
|
|
|
|
|
|
String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
|
|
|
- String s = HttpUtils.sendGet(bakUrl + "/recordpro/api/list", param);
|
|
|
+ String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
|
|
|
// 视频拼接
|
|
|
if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
|
|
|
List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
|
|
|
@@ -704,7 +704,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
|
|
|
String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
|
|
|
// /api/record/flv/list
|
|
|
- String s = HttpUtils.sendGet(bakUrl + "/recordpro/api/list", param);
|
|
|
+ String s = HttpUtils.sendGet(webUrl + "/recordpro/api/list", param);
|
|
|
// 视频拼接
|
|
|
if (!StringUtils.isBlank(s) || "null".equals(s)) {
|
|
|
List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
|
gao.qiang