导入接口修改

Modules/Camera/Jobs/CameraListExcel.php

@@ -7,7 +7,6 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Support\Facades\Log;
 use Modules\Camera\Entities\CameraList;
 use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Services\CameraServices;
@@ -99,9 +98,7 @@ class CameraListExcel implements ShouldQueue
             if ($camera_source == CameraEnum::CAMERA_SOURCE_3) {
                 $camera_url = trim($item[9]);
             } else {
-
                 $camera_url = CameraServices::makeCameraUrl($params);
-
             }
 
             //通过ip+端口+通道号作为唯一标识判断数据是否存在
@@ -121,7 +118,7 @@ class CameraListExcel implements ShouldQueue
                         'mine_id'        => $mine_id,
                         'camera_name'    => trim($item[0]),
                         'user_name'      => trim($item[1]),
-                        'password'       => trim($item[2]),
+                        'pass'       => trim($item[2]),
                         'ip'             => trim($item[3]),
                         'port'           => trim($item[4]),
                         'com_number'     => trim($item[5]),
@@ -140,7 +137,7 @@ class CameraListExcel implements ShouldQueue
                 'mine_id'        => $mine_id,
                 'camera_name'    => trim($item[0]),
                 'user_name'      => trim($item[1]),
-                'password'       => trim($item[2]),
+                'pass'       => trim($item[2]),
                 'ip'             => trim($item[3]),
                 'port'           => trim($item[4]),
                 'com_number'     => trim($item[5]),

Modules/Camera/Services/CameraServices.php

@@ -90,13 +90,13 @@ class CameraServices
     //生成摄像头请求链接
     public static function makeCameraUrl($params)
     {
-
         if ($params['video_recorder'] == CameraEnum::VIDEO_RECORDER_HK) {
             if (isset($params['code_stream'])) {
                 $code_stream = CameraEnum::CODE_STREAM_TRANS[$params['code_stream']];
             } else {
                 $code_stream = 'sub';
             }
+
             if ($params['user_name'] && $params['pass'] && $params['ip'] && $params['port'] && $params['com_number']) {
                 $url  = 'rtsp://' . $params['user_name'] . ':' . $params['pass'] . '@';
                 $url .= $params['ip'] . ':' . $params['port'] . '/' . 'h264' . '/' . 'ch' . $params['com_number'] . '/';
@@ -104,7 +104,6 @@ class CameraServices
             } else {
                 $url = '';
             }
-
         } elseif($params['video_recorder'] == CameraEnum::VIDEO_RECORDER_DH){
             if (isset($params['code_stream'])) {
                 $code_stream = CameraEnum::CODE_STREAM_DH[$params['code_stream']];