|
@@ -524,7 +524,8 @@ public class BaseCameraManagementController extends BaseController {
|
|
// baseCameraManagement.setMilesRange(begin + "-" + end);
|
|
// baseCameraManagement.setMilesRange(begin + "-" + end);
|
|
// baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
|
|
// baseCameraManagement.setLongitudeAndLatitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLongitude());
|
|
// return AjaxResult.success(baseCameraManagement);
|
|
// return AjaxResult.success(baseCameraManagement);
|
|
- String cameraPreviewURL = GetCameraPreviewURL.getPreviewURLs();
|
|
|
|
|
|
+ String cameraPreviewURL = GetCameraPreviewURL.playbackURLs();
|
|
|
|
+// String cameraPreviewURL = GetCameraPreviewURL.getPreviewURLs();
|
|
log.info("-------------------------------->>>>>" + cameraPreviewURL);
|
|
log.info("-------------------------------->>>>>" + cameraPreviewURL);
|
|
JSONObject outJson = JSONObject.parse(cameraPreviewURL);
|
|
JSONObject outJson = JSONObject.parse(cameraPreviewURL);
|
|
log.info("-------------------------------->>>>>outJson------" + outJson);
|
|
log.info("-------------------------------->>>>>outJson------" + outJson);
|
|
@@ -532,10 +533,10 @@ public class BaseCameraManagementController extends BaseController {
|
|
log.info("-------------------------------->>>>>data------" + data);
|
|
log.info("-------------------------------->>>>>data------" + data);
|
|
String urls = data.getString("url");
|
|
String urls = data.getString("url");
|
|
log.info("-------------------------------->>>>>urls------" + urls);
|
|
log.info("-------------------------------->>>>>urls------" + urls);
|
|
- TimeUnit.SECONDS.sleep(5);
|
|
|
|
- String msg = HttpUtils.sendGet("http://10.48.36.47:9080/rtsp/api/pull?target=" + urls + "&streamPath=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006&save=0");
|
|
|
|
|
|
+// TimeUnit.SECONDS.sleep(5);
|
|
|
|
+// String msg = HttpUtils.sendGet("http://10.48.36.47:9080/rtsp/api/pull?target=" + urls + "&streamPath=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006&save=0");
|
|
// String msg = HttpUtils.sendGet("http://10.48.36.47:9080/api/gateway/stop?stream=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006");
|
|
// String msg = HttpUtils.sendGet("http://10.48.36.47:9080/api/gateway/stop?stream=01ea43e6676f4e47bd6c5cd9e02aa006/01ea43e6676f4e47bd6c5cd9e02aa006");
|
|
- return AjaxResult.success(msg);
|
|
|
|
|
|
+ return AjaxResult.success(urls);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|