|
@@ -10,7 +10,7 @@ import com.ozs.common.exception.base.BaseException;
|
|
|
import com.ozs.common.utils.DateUtils;
|
|
|
import com.ozs.common.utils.HttpClientUtil;
|
|
|
import com.ozs.common.utils.http.HttpUtils;
|
|
|
-import com.ozs.service.BaseCameraManagementService;
|
|
|
+import com.ozs.framework.config.ServerConfig;
|
|
|
import com.ozs.system.mapper.SysDictDataMapper;
|
|
|
import com.ozs.web.core.config.CaneraConfig;
|
|
|
import lombok.SneakyThrows;
|
|
@@ -46,7 +46,10 @@ public class CameraUtil {
|
|
|
private static String webUrl;
|
|
|
private static String bakUrl;
|
|
|
private static String bakUrlRtsp;
|
|
|
+ private static String wsUrl;
|
|
|
private static CmdCameraUtil cUtil;
|
|
|
+ private static RedisCache rc;
|
|
|
+ private static ServerConfig sc;
|
|
|
|
|
|
@Autowired
|
|
|
private CaneraConfig caneraConfig;
|
|
@@ -57,9 +60,10 @@ public class CameraUtil {
|
|
|
@Autowired
|
|
|
private SysDictDataMapper dictDataMapper;
|
|
|
|
|
|
- private static RedisCache rc;
|
|
|
@Autowired
|
|
|
private RedisCache redisCache;
|
|
|
+ @Autowired
|
|
|
+ private ServerConfig serverConfig;
|
|
|
|
|
|
public final static String tsFilekey = "mergeVideoTsFile";
|
|
|
|
|
@@ -459,9 +463,11 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
transcribeFilePath = caneraConfig.getTranscribeFilePath();
|
|
|
webUrl = caneraConfig.getWebUrl();
|
|
|
bakUrl = caneraConfig.getBakUrl();
|
|
|
- bakUrlRtsp=caneraConfig.getBakUrlRtsp();
|
|
|
+ bakUrlRtsp = caneraConfig.getBakUrlRtsp();
|
|
|
rc = redisCache;
|
|
|
cUtil = cmdCameraUtil;
|
|
|
+ sc = serverConfig;
|
|
|
+ wsUrl = caneraConfig.getWsUrl();
|
|
|
}
|
|
|
|
|
|
/**
|