视频接口修改

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -383,7 +383,7 @@ class ApiController extends BaseController
         $list = DB::connection('mysql_fwe10')->table('uf_uf_zhxx_sbgl as sbgl')
             ->select('sbgl.ID','sbgl.create_time','sbgl.sbmc','sbgl.scrhsj','sbgl.rhzq','qygl.qymc')
             ->leftJoin('uf_zhxx_sbgl_qygl as qygl','qygl.id','=','sbgl.ssdw')
-            ->where('sbgl.rhzq','!=','')->get()->toArray();
+            ->where('sbgl.rhzq','!=','')->where('sbgl.is_delete',0)->get()->toArray();
 
         foreach($list as $k => $v){
             if($v->scrhsj != null){

Modules/Camera/Services/CameraServices.php

@@ -2002,6 +2002,7 @@ class CameraServices
             $path .= MineList::where('id', $val)->value('title') . '/';
         }
         $path .= $camera->camera_name . '/' . date('Ymd');
+        $path = str_replace(["（", "）", "(", ")"], "", $path);
 
         //标记摄像头为在线状态
         CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ONLINE]);