Forráskód Böngészése

回放easydrawin接口修改

任敬轩 3 éve
szülő
commit
ce59dac6f5

+ 1 - 1
Modules/Camera/Entities/CameraList.php

@@ -10,5 +10,5 @@ class CameraList extends Model
     protected $table        = 'camera_list';
     public    $incrementing = false;
     protected $keyType      = 'string';
-    protected $fillable     = ['mine_id', 'index_code', 'camera_name', 'camera_source', 'revert_id', 'ip', 'port', 'com_number','sort','video_recorder','camera_status','playback'];
+    protected $fillable     = ['mine_id', 'index_code', 'camera_name', 'camera_source', 'revert_id', 'ip', 'port', 'com_number','sort','video_recorder','camera_status','playback','revert_back_id'];
 }

+ 1 - 1
Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -405,7 +405,7 @@ class HaiKangController extends BaseController
         $degree = MineList::where('id', $query->mine_id)->value('degree');
         $degree = explode('|', $degree);
 
-        $mine_list = MineList::whereIn('id', explode('|', $degree))->select(['title'])->get()->toArray();
+        $mine_list = MineList::whereIn('id', $degree)->select(['title'])->get()->toArray();
 
         $path = '';
         $path = '/'.$mine_list[0]['title'].'/回放'.$start_time;

+ 2 - 0
Modules/Camera/Services/CameraServices.php

@@ -1253,6 +1253,7 @@ class CameraServices
                     CameraList::where('revert_id', $val['id'])->update(
                         [
                             'revert_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                            'revert_back_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
                             'updated_at' => date('Y-m-d H:i:s'),
                         ]
                     );
@@ -1269,6 +1270,7 @@ class CameraServices
             CameraList::where('revert_id', '!=', CameraEnum::CAMERA_DEFAULT_REVERT_ID)->update(
                 [
                     'revert_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                    'revert_back_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
                     'updated_at' => date('Y-m-d H:i:s'),
                 ]
             );