修改后台添加摄像头地址

.idea/workspace.xml

@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/public/template/摄像头列表导入模板_v1.0.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/public/template/摄像头列表导入模板_v1.0.xlsx" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -24,11 +29,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="284">
-              <caret line="141" column="41" selection-start-line="141" selection-start-column="41" selection-end-line="141" selection-end-column="41" />
+            <state relative-caret-position="285">
+              <caret line="223" column="37" lean-forward="true" selection-start-line="223" selection-start-column="37" selection-end-line="223" selection-end-column="37" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -36,11 +41,29 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1340">
+              <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="31" column="11" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="31" selection-end-column="11" />
+            <state relative-caret-position="399">
+              <caret line="110" column="12" selection-start-line="110" selection-start-column="12" selection-end-line="110" selection-end-column="12" />
               <folding>
                 <element signature="e#129#166#0#PHP" expanded="true" />
               </folding>
@@ -51,8 +74,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="354">
-              <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
+            <state relative-caret-position="367">
+              <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
               <folding>
                 <element signature="e#128#165#0#PHP" expanded="true" />
               </folding>
@@ -61,10 +84,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log">
+        <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+            <state relative-caret-position="123">
+              <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
             </state>
           </provider>
         </entry>
@@ -111,9 +134,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-14.log" />
-        <option value="$PROJECT_DIR$/composer.json" />
-        <option value="$PROJECT_DIR$/config/app.php" />
         <option value="$PROJECT_DIR$/app/Http/Kernel.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php" />
         <option value="$PROJECT_DIR$/app/Providers/AppServiceProvider.php" />
@@ -151,8 +171,6 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/MenusController.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Routes/web.php" />
         <option value="$PROJECT_DIR$/vendor/overtrue/pinyin/src/Pinyin.php" />
@@ -161,7 +179,12 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
         <option value="$PROJECT_DIR$/app/Helpers.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
       </list>
     </option>
   </component>
@@ -310,22 +333,7 @@
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
-              <item name="Admin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="Modules" type="462c0819:PsiDirectoryNode" />
-              <item name="Admin" type="462c0819:PsiDirectoryNode" />
-              <item name="Database" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="Modules" type="462c0819:PsiDirectoryNode" />
-              <item name="Admin" type="462c0819:PsiDirectoryNode" />
-              <item name="Database" type="462c0819:PsiDirectoryNode" />
-              <item name="Seeders" type="462c0819:PsiDirectoryNode" />
+              <item name="Camera" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
@@ -376,12 +384,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="100356000" />
+      <workItem from="1618368497550" duration="110237000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="100499000" />
+    <option name="totallyTimeSpent" value="110380000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -412,21 +420,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-989" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="379">
-          <caret line="22" column="27" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Entities/Menu.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
@@ -465,13 +458,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -567,13 +553,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="18" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/index.blade.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -594,13 +573,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="15" column="24" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -608,16 +580,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-748">
-          <caret line="40" column="36" selection-start-line="40" selection-start-column="36" selection-end-line="40" selection-end-column="36" />
-          <folding>
-            <element signature="e#136#149#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -625,26 +587,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="343">
-          <caret line="81" column="50" selection-start-line="81" selection-start-column="50" selection-end-line="81" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Resources/views/layouts/master.blade.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/.env">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="17" column="68" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="676">
@@ -681,23 +629,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="354">
-          <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
-          <folding>
-            <element signature="e#128#165#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/Pinyin.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="438">
@@ -762,25 +693,108 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="141" column="41" selection-start-line="141" selection-start-column="41" selection-end-line="141" selection-end-column="41" />
+        <state relative-caret-position="605">
+          <caret line="157" column="45" selection-start-line="144" selection-start-column="7" selection-end-line="157" selection-end-column="45" />
           <folding>
-            <element signature="e#51#107#0#PHP" expanded="true" />
+            <element signature="e#136#149#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/UserEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="8" selection-start-line="8" selection-end-line="11" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="13" column="34" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="21" column="73" selection-start-line="21" selection-start-column="55" selection-end-line="21" selection-end-column="73" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="17" column="30" selection-start-line="17" selection-start-column="10" selection-end-line="17" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="31" column="11" lean-forward="true" selection-start-line="25" selection-start-column="10" selection-end-line="31" selection-end-column="11" />
+        <state relative-caret-position="399">
+          <caret line="110" column="12" selection-start-line="110" selection-start-column="12" selection-end-line="110" selection-end-column="12" />
           <folding>
             <element signature="e#129#166#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/MenusService.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="367">
+          <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
+          <folding>
+            <element signature="e#128#165#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="123">
+          <caret line="6" column="54" selection-start-line="6" selection-start-column="54" selection-end-line="6" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1340">
+          <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="223" column="37" lean-forward="true" selection-start-line="223" selection-start-column="37" selection-end-line="223" selection-end-column="37" />
+          <folding>
+            <element signature="e#51#107#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateCameraListTableFields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('camera_list', function (Blueprint $table) {
+            $table->string('camera_name', 20)->after('camera_url')->comment('摄像头名称');
+            $table->string('revert_id', 20)->after('camera_url')->comment('流媒体返回id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('camera_list', function (Blueprint $table) {
+            $table->dropColumn('camera_name');
+            $table->dropColumn('revert_id');
+        });
+    }
+}

Modules/Camera/Enum/CameraEnum.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiuzijian
+ * Date: 2021-04-23
+ * Time: 15:18
+ */
+
+namespace Modules\Camera\Enum;
+
+class CameraEnum
+{
+    //默认流媒体返回id
+    const CAMERA_DEFAULT_REVERT_ID = 'NullId';
+}

Modules/Camera/Http/Controllers/CameraController.php

@@ -40,6 +40,8 @@ class CameraController extends BaseController
         )->select(
             'camera_list.id',
             'camera_list.camera_url',
+            'camera_list.camera_name',
+            'camera_list.revert_id',
             'mine_list.title',
             'mine_list.degree'
         )->paginate(50);
@@ -52,6 +54,8 @@ class CameraController extends BaseController
         $tableObj->topActions = ['add', 'import', 'importTemplate'];
         $tableObj->column('parent_title', '矿区名称');
         $tableObj->column('title', '区域名称');
+        $tableObj->column('camera_name', '摄像头名称');
+        $tableObj->column('revert_id', '流媒体id');
         $tableObj->column('camera_url', '链接');
         return $this->tableList($tableObj);
     }
@@ -73,6 +77,8 @@ class CameraController extends BaseController
             'camera_list.password',
             'camera_list.com_number',
             'camera_list.camera_url',
+            'camera_list.camera_name',
+            'camera_list.revert_id',
             'mine_list.title',
             'mine_list.degree'
         )->first();
@@ -82,10 +88,12 @@ class CameraController extends BaseController
         $tableObj = new TableAuxiliary('', $camera_list);
         $tableObj->column('parent_title', '矿区名称');
         $tableObj->column('title', '区域名称');
-        $tableObj->column('ip', 'ip地址');
-        $tableObj->column('port', '端口');
+        $tableObj->column('camera_name', '摄像头名称');
+        $tableObj->column('revert_id', '流媒体id');
         $tableObj->column('user_name', '用户名');
         $tableObj->column('password', '密码');
+        $tableObj->column('ip', 'ip地址');
+        $tableObj->column('port', '端口');
         $tableObj->column('com_number', '通道号');
         $tableObj->column('camera_url', '链接');
         $tableObj->title = '摄像头链接详情';
@@ -99,28 +107,14 @@ class CameraController extends BaseController
         $mineService->initMineList();
         $titleList = $mineService->getTierList();
 
-//        $field_list = CameraFieldList::select(
-//            [
-//                'id',
-//                'field_name'
-//            ]
-//        )->get();
-//
-//        $field_arr = [];
-//        foreach ($field_list as $key => $val) {
-//            $field_arr[$val['id']] = $val['field_name'];
-//        }
-
         $formObj = new FromAuxiliary('camera/list/add');
         $formObj->tree_select('mine_id', '矿区单位', $titleList);
-        $formObj->input('ip', 'ip地址');
-        $formObj->input('port', '端口');
+        $formObj->input('camera_name', '摄像头名称');
         $formObj->input('user_name', '用户名');
         $formObj->input('password', '密码');
+        $formObj->input('ip', 'ip地址');
+        $formObj->input('port', '端口');
         $formObj->input('com_number', '通道号');
-//        $formObj->input('status', '状态');
-//        $formObj->input('camera_url', '请求链接');
-//        $formObj->checkbox('camera_field', '字段', $field_arr);
         $formObj->title = '添加请求链接';
         return $this->from($formObj);
     }
@@ -132,6 +126,10 @@ class CameraController extends BaseController
             return $this->error(1, '请选择矿区单位');
         }
 
+        if (!$request->input('camera_name')) {
+            return $this->error(1, '请输入摄像头名称');
+        }
+
         if (
             !$request->input('ip') || !$request->input('port') || !$request->input('user_name')
             || !$request->input('password') ||!$request->input('com_number')
@@ -151,13 +149,54 @@ class CameraController extends BaseController
     //编辑摄像头列表
     public function cameraListEdit(Request $request)
     {
+        $id = $request->input('id');
+        if (empty($id)) {
+            return $this->redirect('admin/camera/list');
+        }
+
+        $mineService = new MineServices();
+        $mineService->initMineList();
+        $titleList = $mineService->getTierList();
 
+        $camera_list = CameraList::find($id);
+
+        $formObj = new FromAuxiliary('camera/list/edit', $camera_list);
+        $formObj->tree_select('mine_id', '矿区单位', $titleList);
+        $formObj->input('camera_name', '摄像头名称');
+        $formObj->input('user_name', '用户名');
+        $formObj->input('password', '密码');
+        $formObj->input('ip', 'ip地址');
+        $formObj->input('port', '端口');
+        $formObj->input('com_number', '通道号');
+        $formObj->title = '编辑请求链接';
+        return $this->from($formObj);
     }
 
     //编辑摄像头操作
     public function cameraListEditPost(Request $request)
     {
+        if (!$request->input('mine_id')) {
+            return $this->error(1, '请选择矿区单位');
+        }
 
+        if (!$request->input('camera_name')) {
+            return $this->error(1, '请输入摄像头名称');
+        }
+
+        if (
+            !$request->input('ip') || !$request->input('port') || !$request->input('user_name')
+            || !$request->input('password') ||!$request->input('com_number')
+        ) {
+            return $this->error(1, '请输入必填字段');
+        }
+
+        $result = CameraServices::editCameraList($request->all());
+
+        if (!$result['status']) {
+            return $this->error(1, $result['msg']);
+        }
+
+        return $this->redirect('admin/camera/list');
     }
 
     //删除摄像头列表记录
@@ -194,7 +233,7 @@ class CameraController extends BaseController
         $reader->close();
         $result = CameraListExcel::dispatch($arr);
         if (!$result) {
-            return $this->error(1, '上传失败，请重试');
+            return $this->error(1, '所传矿区信息不存在');
         }
         return $this->success();
     }

Modules/Camera/Jobs/CameraListExcel.php

@@ -10,6 +10,7 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 use Modules\Admin\Enum\AdminEnum;
 use Modules\Camera\Entities\CameraList;
+use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Services\CameraServices;
 use Modules\Fleamarket\Services\MaterialsClassify;
 use Modules\Mine\Entities\MineList;
@@ -37,22 +38,18 @@ class CameraListExcel implements ShouldQueue
      */
     public function handle()
     {
-        return $this->fieldsMap($this->exceData);
+        $this->fieldsMap($this->exceData);
     }
 
     protected function fieldsMap($rows)
     {
-        $result['status'] = true;
-        $result['msg']    = AdminEnum::RETURN_SUCCESS;
-
         //矿区信息
         $mine_name = $rows[0][0];
         $area_name = $rows[0][1];
 
         $mine_parent_id = MineList::where('title', $mine_name)->value('id');
         if (!$mine_parent_id) {
-            $result['status'] = false;
-            $result['msg']    = AdminEnum::MINE_NOT_EXIST;
+            return false;
         }
 
         $mine_id = MineList::where(
@@ -61,9 +58,9 @@ class CameraListExcel implements ShouldQueue
                 'title'     => $area_name,
             ]
         )->value('id');
+
         if (!$mine_id) {
-            $result['status'] = false;
-            $result['msg']    = AdminEnum::MINE_AREA_NOT_EXIST;
+            return false;
         }
 
         $data = [];
@@ -73,33 +70,62 @@ class CameraListExcel implements ShouldQueue
             }
 
             $params = [
-                'ip'         => $item[0],
-                'port'       => $item[1],
-                'user_name'  => $item[2],
-                'password'   => $item[3],
-                'com_number' => $item[4],
+                'user_name'  => $item[1],
+                'password'   => $item[2],
+                'ip'         => $item[3],
+                'port'       => $item[4],
+                'com_number' => $item[5],
             ];
+
+            //通过ip+端口+通道号作为唯一标识判断数据是否存在
+            $query = CameraList::where(
+                [
+                    'ip'         => $params['ip'],
+                    'port'       => $params['port'],
+                    'com_number' => $params['com_number'],
+                ]
+            )->first();
+
             $camera_url = CameraServices::makeCameraUrl($params);
 
+            if ($query) {
+                $res = CameraList::where('id', $query->id)->update(
+                    [
+                        'mine_id'     => $mine_id,
+                        'camera_name' => $item[0],
+                        'user_name'   => $item[1],
+                        'password'    => $item[2],
+                        'ip'          => $item[3],
+                        'port'        => $item[4],
+                        'com_number'  => $item[5],
+//                        'status'     => $params['status'],
+                        'camera_url'  => $camera_url,
+                        'updated_at'  => date('Y-m-d H:i:s'),
+                    ]
+                );
+                continue;
+            }
+
             $data[] = [
-                'mine_id'    => $mine_id,
-                'ip'         => $item[0],
-                'port'       => $item[1],
-                'user_name'  => $item[2],
-                'password'   => $item[3],
-                'com_number' => $item[4],
+                'mine_id'     => $mine_id,
+                'camera_name' => $item[0],
+                'user_name'   => $item[1],
+                'password'    => $item[2],
+                'ip'          => $item[3],
+                'port'        => $item[4],
+                'com_number'  => $item[5],
+                'revert_id'   => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
 //                'status'     => $params['status'],
-                'camera_url' => $camera_url,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'camera_url'  => $camera_url,
+                'created_at'  => date('Y-m-d H:i:s'),
+                'updated_at'  => date('Y-m-d H:i:s'),
             ];
         }
 
         $result = CameraList::insert($data);
 
         if (!$result) {
-            $result['status'] = false;
-            $result['msg']    = AdminEnum::DATABASE_ERROR;
+            return false;
         }
 
         return true;

Modules/Camera/Services/CameraServices.php

@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Log;
 use Modules\Admin\Enum\AdminEnum;
 use Modules\Camera\Entities\CameraFieldList;
 use Modules\Camera\Entities\CameraList;
+use Modules\Camera\Enum\CameraEnum;
 
 class CameraServices
 {
@@ -22,30 +23,38 @@ class CameraServices
         $result['status'] = true;
         $result['msg']    = AdminEnum::RETURN_SUCCESS;
 
-        //判断字段是否已存在
-//        $query = CameraList::where('mine_id', $params['mine_id'])->first();
-//
-//        if ($query) {
-//            $result['status'] = false;
-//            $result['msg']    = AdminEnum::RECORD_ALREADY_EXIST;
-//            return $result;
-//        }
+        //通过ip+端口+通道号作为唯一标识判断数据是否存在
+        $query = CameraList::where(
+            [
+                'ip'         => $params['ip'],
+                'port'       => $params['port'],
+                'com_number' => $params['com_number'],
+            ]
+        )->first();
+
+        if ($query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_ALREADY_EXIST;
+            return $result;
+        }
 
         $camera_url = self::makeCameraUrl($params);
 
         //入库动作
         $res = CameraList::insert(
             [
-                'mine_id'    => $params['mine_id'],
-                'ip'         => $params['ip'],
-                'port'       => $params['port'],
-                'user_name'  => $params['user_name'],
-                'password'   => $params['password'],
-                'com_number' => $params['com_number'],
+                'mine_id'     => $params['mine_id'],
+                'ip'          => $params['ip'],
+                'port'        => $params['port'],
+                'user_name'   => $params['user_name'],
+                'password'    => $params['password'],
+                'com_number'  => $params['com_number'],
+                'camera_name' => $params['camera_name'],
+                'revert_id'   => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
 //                'status'     => $params['status'],
-                'camera_url' => $camera_url,
-                'created_at' => date('Y-m-d H:i:s'),
-                'updated_at' => date('Y-m-d H:i:s'),
+                'camera_url'  => $camera_url,
+                'created_at'  => date('Y-m-d H:i:s'),
+                'updated_at'  => date('Y-m-d H:i:s'),
             ]
         );
 
@@ -62,10 +71,67 @@ class CameraServices
     {
         $url  = 'rtsp://' . $params['user_name'] . ':' . $params['password'] . '@';
         $url .= $params['ip'] . ':' . $params['port'] . '/' . 'h264' . '/' . 'ch' . $params['com_number'] . '/';
-        $url .= 'main/av_stream';
+        $url .= 'sub/av_stream';     //sub 子码流
+//        $url .= 'main/av_stream';  //main 主码流
         return $url;
     }
 
+    //编辑摄像头链接
+    public static function editCameraList($params)
+    {
+        $result['status'] = true;
+        $result['msg']    = AdminEnum::RETURN_SUCCESS;
+
+        $camera_url = self::makeCameraUrl($params);
+
+        //判断记录是否存在
+        $query = CameraList::find($params['id']);
+
+        if (!$query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_NOT_EXIST;
+            return $result;
+        }
+
+        //通过ip+端口+通道号作为唯一标识判断数据是否存在
+        $query = CameraList::where(
+            [
+                'ip'         => $params['ip'],
+                'port'       => $params['port'],
+                'com_number' => $params['com_number'],
+            ]
+        )->where('id', '!=', $params['id'])->first();
+
+        if ($query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_ALREADY_EXIST;
+            return $result;
+        }
+
+        //更新动作
+        $res = CameraList::where('id', $params['id'])->update(
+            [
+                'mine_id'     => $params['mine_id'],
+                'ip'          => $params['ip'],
+                'port'        => $params['port'],
+                'user_name'   => $params['user_name'],
+                'password'    => $params['password'],
+                'com_number'  => $params['com_number'],
+                'camera_name' => $params['camera_name'],
+//                'status'     => $params['status'],
+                'camera_url'  => $camera_url,
+                'updated_at'  => date('Y-m-d H:i:s'),
+            ]
+        );
+
+        if (!$res) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return $result;
+    }
+
     //删除摄像头列表记录
     public static function delCameraList($params)
     {