洗選首頁接口

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -1309,7 +1309,7 @@ class CameraApiController extends BaseController
 
     //摄像头下拉列表
     public function cameraSelect(Request $request){
-        $result = '<select style="width:99%;" class="form-control" name="camera"><option value="0">-选择模块-</option>';
+        $result = '<select style="width:99%;" class="form-control" name="camera"><option value="0">-选择摄像头-</option>';
 
         $mine_list = DB::table('mine_list')->where('parent_id',6356)->where('deleted_at',null)->get();
 
@@ -1348,4 +1348,11 @@ class CameraApiController extends BaseController
 
         return $result;
     }
+
+    //首頁信息
+    public function taskHome(Request $request){
+        $result = DB::connection('task_xixuan')->table('xx_area')->get();
+
+        return $result;
+    }
 }

Modules/Camera/Routes/api.php

@@ -58,4 +58,5 @@ Route::namespace('Api')->group(function () {
     //洗选高风险录入
     Route::post('camera/camera_select', 'CameraApiController@cameraSelect');//摄像头下拉列表
     Route::post('camera/camera_info', 'CameraApiController@cameraInfo');//摄像头信息
+    Route::post('task_xixuan/home', 'CameraApiController@taskHome');//首頁接口
 });

app/Http/Controllers/TestsController.php

@@ -60,11 +60,8 @@ class TestsController {
 
     //区域下摄像头接口测试
     public function camera_list(){
-<<<<<<< HEAD
         $result = CameraServices::getHaiKangCamera(968, '64018155582160000014', CameraEnum::CAMERA_TYPE_ALL);
-=======
-        $result = CameraServices::getHaiKangCamera(968, '64018112582160000010', CameraEnum::CAMERA_TYPE_ALL);
->>>>>>> c2ff58eff46a0a950ad30de1e0770e68ef26aeec
+
         dd($result);
         //同步区域下摄像头
         if ($result['status']) {

config/database.php

@@ -204,6 +204,24 @@ return [
             ]) : [],
         ],
 
+        'task_xixuan' => [
+            'driver'         => 'mysql',
+            'host'           => env('DB_TASK_XIXUAN_HOST', '127.0.0.1'),
+            'port'           => env('DB_TASK_XIXUAN_PORT', '3306'),
+            'database'       => env('DB_TASK_XIXUAN_DATABASE', 'task_xixuan'),
+            'username'       => env('DB_TASK_XIXUAN_USERNAME', ''),
+            'password'       => env('DB_TASK_XIXUAN_PASSWORD', ''),
+            'unix_socket'    => '',
+            'charset'        => 'utf8mb4',
+            'collation'      => 'utf8mb4_general_ci',
+            'prefix'         => '',
+            'prefix_indexes' => true,
+            'strict'         => true,
+            'engine'         => null,
+            'options'        => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
     ],
 
     /*