1
0

4 Commity ae658089d4 ... 481a7cb860

Autor SHA1 Správa Dátum
  任敬轩 481a7cb860 摄像头接口 2 mesiacov pred
  任敬轩 e25a1c2d4e Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master 3 mesiacov pred
  任敬轩 f50db56a29 仓储煤仓 3 mesiacov pred
  任敬轩 a7d705a1cf 仓储煤仓 3 mesiacov pred

+ 2 - 1
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -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

+ 1 - 1
Modules/Camera/Services/CameraServices.php

@@ -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,