瀏覽代碼

摄像头状态同步修改

任敬轩 3 年之前
父節點
當前提交
4a62791355

+ 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','status'];
+    protected $fillable     = ['mine_id', 'index_code', 'camera_name', 'camera_source', 'revert_id', 'ip', 'port', 'com_number','sort','video_recorder','camera_status'];
 }

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

@@ -210,9 +210,9 @@ class HaiKangController extends BaseController
         $result_status = json_decode($result_status, true);
 
         if(isset($result_status['data']['list'][0]['online']) && $result_status['data']['list'][0]['online'] == 1){
-            return 0;//在线
+            return 1;//在线
         }else{
-            return 1;//离线
+            return 2;//离线
         }
     }
 

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

@@ -1148,7 +1148,7 @@ class CameraServices
                 $list[$key]['camera_name'] = $val['cameraName'];
                 $list[$key]['trans_code']  = $val['encodeDevIndexCode'];
                 $list[$key]['com_number']  = $val['channelNo'];
-                $list[$key]['status'] = $haikang->getCameraStatus($val['cameraIndexCode']);
+                $list[$key]['camera_status'] = $haikang->getCameraStatus($val['cameraIndexCode']);
             }
         }
 

+ 1 - 1
app/Console/Commands/UpdateHkList.php

@@ -171,7 +171,7 @@ class UpdateHkList extends Command
                         'port'          => $port,
                         'com_number'    => $com_number,
                         //'sort'          => $arr_count - $k,
-                        'status'        => $v['status'],
+                        'camera_status'        => $v['camera_status'],
                     ];
                     CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
                 }