Parcourir la source

摄像头类型修改

任敬轩 il y a 1 an
Parent
commit
c4e058cfaf

+ 6 - 0
Modules/Camera/Enum/CameraEnum.php

@@ -49,6 +49,9 @@ class CameraEnum
     const CAMERA_TYPE_COALYARD = 5;      //煤场
     const CAMERA_TYPE_RISK = 6;      //高风险作业
     const CAMERA_TYPE_PLACE = 7;      //培训场所
+    const CAMERA_TYPE_FIXED = 8;      //固定摄像头
+    const CAMERA_TYPE_MOVE = 9;      //移动摄像头
+    const CAMERA_TYPE_ENFORCE = 10;      //执法记录仪
 
     const CAMERA_TYPE_EXCHANGE = [
         self::CAMERA_TYPE_NORMAL   => '普通摄像头',
@@ -58,6 +61,9 @@ class CameraEnum
         self::CAMERA_TYPE_COALYARD => '煤场监控',
         self::CAMERA_TYPE_RISK => '高风险作业',
         self::CAMERA_TYPE_PLACE => '培训场所',
+        self::CAMERA_TYPE_FIXED => '固定摄像头',
+        self::CAMERA_TYPE_MOVE => '移动摄像头',
+        self::CAMERA_TYPE_ENFORCE => '执法记录仪'
     ];
 
     //调取海康接口类型

+ 7 - 0
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -1306,4 +1306,11 @@ class CameraApiController extends BaseController
 
         return self::successResponse($camera_record);
     }
+
+    //摄像头下拉列表
+    public function cameraSelect(Request $request){
+        $result = 11;
+
+        return $result;
+    }
 }

+ 3 - 0
Modules/Camera/Routes/api.php

@@ -54,4 +54,7 @@ Route::namespace('Api')->group(function () {
     Route::post('type_list','CameraApiController@typeList');//分类列表
     Route::post('camera_record_insert','CameraApiController@cameraRecordInsert');//摄像托访问记录入库
     Route::post('camera_record_list','CameraApiController@cameraRecordList');//摄像托访问记录列表
+
+    //洗选高风险录入
+    Route::post('camera/camera_select', 'CameraApiController@cameraSelect');//摄像头下拉列表
 });

+ 36 - 4
app/Http/Controllers/TestsController.php

@@ -28,9 +28,6 @@ class TestsController {
 
     public function test()
     {
-        $res = DB::connection('etl_zaoquan')->select("select * from news_column_list")->get();
-        dd($res);
-
         //宁煤洗选重复摄像头
         //$this->xixuan_repeat();
 
@@ -61,8 +58,43 @@ class TestsController {
 
     //区域下摄像头接口测试
     public function camera_list(){
-        $result = CameraServices::getHaiKangCamera(968, '154ddc6b-59eb-4c6d-aa9f-9af06cdf6c0c', CameraEnum::CAMERA_TYPE_ALL);
+        $result = CameraServices::getHaiKangCamera(968, '64018155582160000014', CameraEnum::CAMERA_TYPE_ALL);
         dd($result);
+        //同步区域下摄像头
+        if ($result['status']) {
+            $trans_arr = [];
+            $index_code_arr = [];
+            foreach ($result['data'] as $k => $v) {
+                $ip         = '';
+                $port       = '';
+                $com_number = '';
+                //当前摄像头index_code数组
+                $index_code_arr[$k] = $v['camera_id'];
+                $params = [
+                    'mine_id'       => 4840,
+                    'camera_name'   => $this->transformCameraName($v['camera_name']),
+                    'index_code'    => $v['camera_id'],
+                    'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                    'camera_source' => CameraEnum::CAMERA_SOURCE_2,
+                    'ip'            => $ip,
+                    'port'          => $port,
+                    'com_number'    => $com_number,
+                ];
+                CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
+            }
+            //删除不存在的摄像头
+            CameraList::where('mine_id', $val->id)->where('index_code', '!=', NULL)->whereNotIn('index_code', $index_code_arr)->delete();
+        }
+    }
+
+    //转义摄像头名称中的特殊字符
+    public function transformCameraName($camera_name)
+    {
+        $camera_name = trim($camera_name);
+        $camera_name = str_replace('#', '号', $camera_name);
+        $camera_name = str_replace(' ', '-', $camera_name);
+        $camera_name = str_replace('+', '', $camera_name);
+        return $camera_name;
     }
 
     //直播列表