@@ -825,7 +825,8 @@ class CameraApiController extends BaseController
}
//海康切片逻辑
else{
- $result = CameraServices::downloadCameraFiles($parent_id, $camera_id);
+ //暂时关了ffmpeg
+// $result = CameraServices::downloadCameraFiles($parent_id, $camera_id);
} else {
//判断硬盘录像机的有没有封面图,有的走easydrawin,没有的走ffmpeg
@@ -1459,7 +1459,7 @@ class CameraServices
- if ($success == $curl_res['total']) {
+ if (isset($curl_res['total']) && $success == $curl_res['total']) {
CameraList::where('revert_id', '!=', CameraEnum::CAMERA_DEFAULT_REVERT_ID)->update(
[
'revert_id' => CameraEnum::CAMERA_DEFAULT_REVERT_ID,