|
|
@@ -64,6 +64,7 @@ public class CameraUtil {
|
|
|
private static CmdCameraUtil cUtil;
|
|
|
private static RedisCache rc;
|
|
|
private static ServerConfig sc;
|
|
|
+ private static String recordUrl;
|
|
|
|
|
|
public final static String tsFilekey = "mergeVideoTsFile";
|
|
|
|
|
|
@@ -458,7 +459,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
}
|
|
|
|
|
|
public static List<Map<String, Object>> getRecordList(String channel, Date startTm, Date endTm) {
|
|
|
- return filterRecordList(channel, startTm, endTm, filePath, sc.getUrl() + "/profile/");
|
|
|
+ return filterRecordList(channel, startTm, endTm, filePath, recordUrl + "/profile/");
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -783,6 +784,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
rc = redisCache;
|
|
|
sc = serverConfig;
|
|
|
wsUrl = caneraConfig.getWsUrl();
|
|
|
+ recordUrl = caneraConfig.getWsUrl();
|
|
|
}
|
|
|
|
|
|
|
