修改后台功能

.gitignore

@@ -10,4 +10,3 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-/public/files

.idea/workspace.xml

@@ -2,14 +2,14 @@
 <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/Jobs/CameraListExcel.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/video_system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/video_system.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php" 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$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" 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/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/web.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -25,8 +25,8 @@
       <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="273">
-              <caret line="22" column="35" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="35" />
+            <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>
@@ -34,8 +34,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="590">
-              <caret line="120" column="28" selection-start-line="120" selection-start-column="28" selection-end-line="120" selection-end-column="28" />
+            <state relative-caret-position="510">
+              <caret line="194" column="29" selection-start-line="194" selection-start-column="29" selection-end-line="194" selection-end-column="29" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -43,20 +43,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="361">
-              <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />
-            </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="209">
-              <caret line="19" column="40" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="40" />
+            <state relative-caret-position="447">
+              <caret line="62" column="20" selection-start-line="62" selection-start-column="20" selection-end-line="62" selection-end-column="20" />
               <folding>
                 <element signature="e#129#166#0#PHP" expanded="true" />
               </folding>
@@ -64,11 +55,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+            <state relative-caret-position="274">
+              <caret line="246" column="37" lean-forward="true" selection-start-line="246" selection-start-column="15" selection-end-line="246" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -77,12 +68,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>url()</find>
-      <find>Auth::guard('admin')</find>
-      <find>sortMenu</find>
-      <find>menu_</find>
-      <find>js/admin/layui</find>
-      <find>admin</find>
       <find>checkBt</find>
       <find>permission</find>
       <find>tinymce/t</find>
@@ -107,6 +92,12 @@
       <find>checkbox</find>
       <find>CAMERA_FIELD_ALREADY_EXIST</find>
       <find>CAMERA_FIELD_NOT_EXIST</find>
+      <find>f</find>
+      <find>uploadFile</find>
+      <find>uploadFiles</find>
+      <find>formObj-&gt;uploadFiles</find>
+      <find>-&gt;uploadFiles</find>
+      <find>$uploadURLPath</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -115,7 +106,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/Http/Middleware/Authenticate.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/Auth/LoginController.php" />
         <option value="$PROJECT_DIR$/app/Http/Middleware/RedirectIfAuthenticated.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Services/FilterService.php" />
@@ -147,7 +137,6 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_16_083654_create_mine_list_table.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Routes/web.php" />
-        <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
@@ -158,14 +147,16 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Services/UsersService.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_071702_create_camera_field_list.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log" />
         <option value="$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log" />
+        <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/Camera/Services/CameraServices.php" />
       </list>
     </option>
   </component>
@@ -321,14 +312,15 @@
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Admin" type="462c0819:PsiDirectoryNode" />
-              <item name="Enum" type="462c0819:PsiDirectoryNode" />
+              <item name="Resources" 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="Routes" type="462c0819:PsiDirectoryNode" />
+              <item name="Resources" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
@@ -380,6 +372,11 @@
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
+              <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="routes" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
@@ -426,12 +423,12 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="76797000" />
+      <workItem from="1618368497550" duration="88430000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="76940000" />
+    <option name="totallyTimeSpent" value="88573000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -462,30 +459,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/vendor/overtrue/pinyin/src/const.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
-        </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="6342">
-          <caret line="309" lean-forward="true" selection-start-line="309" selection-end-line="309" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Helpers.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="445">
-          <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-15.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/User.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -515,13 +488,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/layouts/master.blade.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="559">
-          <caret line="120" column="26" lean-forward="true" selection-start-line="104" selection-start-column="14" selection-end-line="120" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-16.log">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="372">
@@ -673,13 +639,6 @@
         </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="273">
-          <caret line="15" column="35" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraFieldList.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="42">
@@ -701,13 +660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="160" column="28" selection-start-line="160" selection-start-column="20" selection-end-line="160" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="172">
@@ -715,16 +667,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="491">
-          <caret line="192" column="58" selection-start-line="192" selection-start-column="45" selection-end-line="192" selection-end-column="58" />
-          <folding>
-            <element signature="e#136#193#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Services/UsersService.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="463">
@@ -735,92 +677,148 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/UsersController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1473">
-          <caret line="96" column="37" selection-start-line="96" selection-start-column="37" selection-end-line="96" selection-end-column="37" />
+        <state relative-caret-position="310">
+          <caret line="44" column="49" lean-forward="true" selection-start-line="42" selection-start-column="8" selection-end-line="44" selection-end-column="49" />
           <folding>
-            <element signature="e#136#149#0#PHP" expanded="true" />
+            <element signature="e#49#93#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_from.blade.php">
+    <entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/File/UploadedFile.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4022">
-          <caret line="146" column="48" lean-forward="true" selection-start-line="146" selection-start-column="48" selection-end-line="146" selection-end-column="48" />
+        <state relative-caret-position="260">
+          <caret line="87" column="20" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
       <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 relative-caret-position="168">
+          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
+    <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="310">
-          <caret line="44" column="49" lean-forward="true" selection-start-line="42" selection-start-column="8" selection-end-line="44" selection-end-column="49" />
+        <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>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/login.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="28" column="14" selection-start-line="28" selection-start-column="14" selection-end-line="28" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="232" column="64" selection-start-line="232" selection-start-column="50" selection-end-line="232" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Resources/views/component/template_from.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4763">
+          <caret line="703" column="35" selection-start-line="703" selection-start-column="32" selection-end-line="703" selection-end-column="35" />
           <folding>
-            <element signature="e#49#93#0#PHP" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/web.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="22" column="35" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="35" />
+        <state relative-caret-position="236">
+          <caret line="206" column="28" selection-start-line="206" selection-start-column="23" selection-end-line="206" selection-end-column="28" />
+          <folding>
+            <element signature="e#136#193#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/File/UploadedFile.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="87" column="20" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
+        <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$/Modules/Camera/Services/CameraServices.php">
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-21.log">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="19" column="40" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="40" />
+        <state relative-caret-position="105">
+          <caret line="5" column="4" lean-forward="true" selection-start-line="5" selection-start-column="4" selection-end-line="5" selection-end-column="4" />
+        </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#129#166#0#PHP" expanded="true" />
+            <element signature="e#136#149#0#PHP" expanded="true" />
           </folding>
         </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="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/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">
+          <caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
+        </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="590">
-          <caret line="120" column="28" selection-start-line="120" selection-start-column="28" selection-end-line="120" selection-end-column="28" />
+        <state relative-caret-position="510">
+          <caret line="194" column="29" selection-start-line="194" selection-start-column="29" selection-end-line="194" selection-end-column="29" />
           <folding>
             <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-20.log">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        <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$/vendor/laravel/framework/src/Illuminate/Foundation/Bus/Dispatchable.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.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 relative-caret-position="447">
+          <caret line="62" column="20" selection-start-line="62" selection-start-column="20" selection-end-line="62" selection-end-column="20" />
+          <folding>
+            <element signature="e#129#166#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php">
+    <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$/Modules/Admin/Resources/views/layouts/master.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />
+        <state relative-caret-position="274">
+          <caret line="246" column="37" lean-forward="true" selection-start-line="246" selection-start-column="15" selection-end-line="246" selection-end-column="37" />
         </state>
       </provider>
     </entry>

Modules/Admin/Enum/AdminEnum.php

@@ -17,4 +17,6 @@ class AdminEnum
     const USER_NOT_EXIST       = '后台用户不存在';
     const RECORD_ALREADY_EXIST = '该记录已存在';
     const RECORD_NOT_EXIST     = '记录不存在';
+    const MINE_NOT_EXIST       = '所传矿井不存在';
+    const MINE_AREA_NOT_EXIST  = '所传区域不存在';
 }

Modules/Admin/Http/Controllers/UsersController.php

@@ -38,7 +38,7 @@ class UsersController extends BaseController
                            ->orWhere('name', 'like', '%' . $request->input('name_staffNum_mobile') . '%');
         }
 
-        $users = $query->get();
+        $users = $query->paginate(50);
 
         $tableObj             = new TableAuxiliary('users/list', $users);
         $tableObj->primaryKey = 'staff_num';

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

@@ -16,7 +16,13 @@ class CreateCameraListTable extends Migration
         Schema::create('camera_list', function (Blueprint $table) {
             $table->bigIncrements('id')->comment('摄像头管理表');
             $table->integer('mine_id')->index()->comment('矿区id(mine_list表id)');
-            $table->string('camera_url')->comment('拼接完成的请求链接');
+            $table->string('ip', 50)->nullable()->comment('ip地址');
+            $table->string('port', 10)->nullable()->comment('端口');
+            $table->string('user_name', 50)->nullable()->comment('用户名');
+            $table->string('password', 100)->nullable()->comment('密码');
+            $table->string('com_number', 100)->nullable()->comment('通讯号');
+            $table->tinyInteger('status')->default(0)->comment('状态');
+            $table->string('camera_url')->nullable()->comment('拼接完成的请求链接');
             $table->timestamps();
             $table->softDeletes();
         });

Modules/Camera/Http/Controllers/CameraController.php

@@ -15,6 +15,7 @@ use Modules\Camera\Entities\CameraFieldList;
 use Modules\Camera\Entities\CameraList;
 use Modules\Camera\Jobs\CameraListExcel;
 use Modules\Camera\Services\CameraServices;
+use Modules\Mine\Entities\MineList;
 use Modules\Mine\Services\MineServices;
 
 class CameraController extends BaseController
@@ -39,16 +40,58 @@ class CameraController extends BaseController
         )->select(
             'camera_list.id',
             'camera_list.camera_url',
-            'mine_list.title'
-        )->get();
+            'mine_list.title',
+            'mine_list.degree'
+        )->paginate(50);
+
+        foreach ($camera_list as $key => $val) {
+            $camera_list[$key]->parent_title = MineList::where('id', explode('|', $val->degree)[0])->value('title');
+        }
 
         $tableObj             = new TableAuxiliary('camera/list', $camera_list);
-        $tableObj->topActions = ['export', 'import', 'importTemplate'];
-        $tableObj->column('title', '矿区名称');
+        $tableObj->topActions = ['add', 'import', 'importTemplate'];
+        $tableObj->column('parent_title', '矿区名称');
+        $tableObj->column('title', '区域名称');
         $tableObj->column('camera_url', '链接');
         return $this->tableList($tableObj);
     }
 
+    //查看摄像头列表详情
+    public function cameraListView(Request $request)
+    {
+        if (!$request->has('id')) {
+            return $this->redirect('admin/camera/list');
+        }
+
+        $camera_list = CameraList::join(
+            'mine_list', 'camera_list.mine_id', '=', 'mine_list.id'
+        )->where('camera_list.id', $request->input('id'))->select(
+            'camera_list.id',
+            'camera_list.ip',
+            'camera_list.port',
+            'camera_list.user_name',
+            'camera_list.password',
+            'camera_list.com_number',
+            'camera_list.camera_url',
+            'mine_list.title',
+            'mine_list.degree'
+        )->first();
+
+        $camera_list->parent_title = MineList::where('id', explode('|', $camera_list->degree)[0])->value('title');
+
+        $tableObj = new TableAuxiliary('', $camera_list);
+        $tableObj->column('parent_title', '矿区名称');
+        $tableObj->column('title', '区域名称');
+        $tableObj->column('ip', 'ip地址');
+        $tableObj->column('port', '端口');
+        $tableObj->column('user_name', '用户名');
+        $tableObj->column('password', '密码');
+        $tableObj->column('com_number', '通道号');
+        $tableObj->column('camera_url', '链接');
+        $tableObj->title = '摄像头链接详情';
+        return $this->tableView($tableObj);
+    }
+
     //添加摄像头列表
     public function cameraListAdd(Request $request)
     {
@@ -70,7 +113,13 @@ class CameraController extends BaseController
 
         $formObj = new FromAuxiliary('camera/list/add');
         $formObj->tree_select('mine_id', '矿区单位', $titleList);
-        $formObj->input('camera_url', '请求链接');
+        $formObj->input('ip', 'ip地址');
+        $formObj->input('port', '端口');
+        $formObj->input('user_name', '用户名');
+        $formObj->input('password', '密码');
+        $formObj->input('com_number', '通道号');
+//        $formObj->input('status', '状态');
+//        $formObj->input('camera_url', '请求链接');
 //        $formObj->checkbox('camera_field', '字段', $field_arr);
         $formObj->title = '添加请求链接';
         return $this->from($formObj);
@@ -83,8 +132,11 @@ class CameraController extends BaseController
             return $this->error(1, '请选择矿区单位');
         }
 
-        if (!$request->input('camera_url')) {
-            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::addCameraList($request->all());
@@ -96,6 +148,31 @@ class CameraController extends BaseController
         return $this->redirect('admin/camera/list');
     }
 
+    //编辑摄像头列表
+    public function cameraListEdit(Request $request)
+    {
+
+    }
+
+    //编辑摄像头操作
+    public function cameraListEditPost(Request $request)
+    {
+
+    }
+
+    //删除摄像头列表记录
+    public function cameraListDelPost(Request $request)
+    {
+        if (!$request->has('id')) {
+            return $this->error(1, '缺少必要参数');
+        }
+
+        $result = CameraServices::delCameraList($request->all());
+        if (!$result['status']) {
+            return $this->error(1, $result['msg']);
+        }
+        return $this->success();
+    }
 
     //导入摄像头列表
     public function cameraListImport(Request $request)
@@ -112,16 +189,22 @@ class CameraController extends BaseController
         $sheet = $sheet->current();  // 获取指定sheet
         $arr   = [];
         foreach ($sheet->getRowIterator() as $index => $row) {  // 读取每行记录
-            if ($index == 1) {
-                continue;
-            }
             $arr[] = $row->toArray();
         }
         $reader->close();
-        CameraListExcel::dispatch($arr);
+        $result = CameraListExcel::dispatch($arr);
+        if (!$result) {
+            return $this->error(1, '上传失败，请重试');
+        }
         return $this->success();
     }
 
+    //下载摄像头列表导入模板
+    public function cameraListTemplate()
+    {
+        return $this->redirect('/template/摄像头列表导入模板_v1.0.xlsx');
+    }
+
     //字段列表
     public function fieldList(Request $request)
     {

Modules/Camera/Jobs/CameraListExcel.php

@@ -8,8 +8,11 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
+use Modules\Admin\Enum\AdminEnum;
 use Modules\Camera\Entities\CameraList;
+use Modules\Camera\Services\CameraServices;
 use Modules\Fleamarket\Services\MaterialsClassify;
+use Modules\Mine\Entities\MineList;
 
 class CameraListExcel implements ShouldQueue
 {
@@ -34,23 +37,72 @@ class CameraListExcel implements ShouldQueue
      */
     public function handle()
     {
-        $this->fieldsMap($this->exceData);
+        return $this->fieldsMap($this->exceData);
     }
 
     protected function fieldsMap($rows)
     {
-        Log::info($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;
+        }
+
+        $mine_id = MineList::where(
+            [
+                'parent_id' => $mine_parent_id,
+                'title'     => $area_name,
+            ]
+        )->value('id');
+        if (!$mine_id) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::MINE_AREA_NOT_EXIST;
+        }
+
         $data = [];
         foreach ($rows as $index => $item) {
+            if ($index == 0 || $index == 1) {
+                continue;
+            }
+
+            $params = [
+                'ip'         => $item[0],
+                'port'       => $item[1],
+                'user_name'  => $item[2],
+                'password'   => $item[3],
+                'com_number' => $item[4],
+            ];
+            $camera_url = CameraServices::makeCameraUrl($params);
+
             $data[] = [
-                'mine_id'    => $item[0],
-                'camera_url' => $item[1],
+                'mine_id'    => $mine_id,
+                'ip'         => $item[0],
+                'port'       => $item[1],
+                'user_name'  => $item[2],
+                'password'   => $item[3],
+                'com_number' => $item[4],
+//                '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'),
             ];
         }
 
-        CameraList::insert($data);
+        $result = CameraList::insert($data);
+
+        if (!$result) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return true;
     }
 
 }

Modules/Camera/Routes/web.php

@@ -15,20 +15,20 @@ Route::prefix('admin')->group(function() {
     //摄像头管理
     Route::get('/camera', 'CameraController@index');
     Route::get('/camera/list', 'CameraController@cameraList');
+    Route::get('/camera/list/view', 'CameraController@cameraListView');
     Route::get('/camera/list/add', 'CameraController@cameraListAdd');
     Route::post('/camera/list/add', 'CameraController@cameraListAddPost');
     Route::get('/camera/list/edit', 'CameraController@cameraListEdit');
     Route::post('/camera/list/edit', 'CameraController@cameraListEditPost');
     Route::post('/camera/list/del', 'CameraController@cameraListDelPost');
     Route::any('/camera/list/import', 'CameraController@cameraListImport');
-    Route::get('/camera/list/export', 'CameraController@cameraListExport');
     Route::get('/camera/list/importTemplate', 'CameraController@cameraListTemplate');
 
     //摄像头链接生成字段管理
-    Route::get('/camera/field_list', 'CameraController@fieldList');
-    Route::get('/camera/field_list/add', 'CameraController@fieldListAdd');
-    Route::post('/camera/field_list/add', 'CameraController@fieldListAddPost');
-    Route::get('/camera/field_list/edit', 'CameraController@fieldListEdit');
-    Route::post('/camera/field_list/edit', 'CameraController@fieldListEditPost');
-    Route::post('/camera/field_list/del', 'CameraController@fieldListDelPost');
+//    Route::get('/camera/field_list', 'CameraController@fieldList');
+//    Route::get('/camera/field_list/add', 'CameraController@fieldListAdd');
+//    Route::post('/camera/field_list/add', 'CameraController@fieldListAddPost');
+//    Route::get('/camera/field_list/edit', 'CameraController@fieldListEdit');
+//    Route::post('/camera/field_list/edit', 'CameraController@fieldListEditPost');
+//    Route::post('/camera/field_list/del', 'CameraController@fieldListDelPost');
 });

Modules/Camera/Services/CameraServices.php

@@ -31,11 +31,19 @@ class CameraServices
             return $result;
         }
 
+        $camera_url = self::makeCameraUrl($params);
+
         //入库动作
         $res = CameraList::insert(
             [
                 'mine_id'    => $params['mine_id'],
-                'camera_url' => $params['camera_url'],
+                'ip'         => $params['ip'],
+                'port'       => $params['port'],
+                'user_name'  => $params['user_name'],
+                'password'   => $params['password'],
+                'com_number' => $params['com_number'],
+//                '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'),
             ]
@@ -49,6 +57,40 @@ class CameraServices
         return $result;
     }
 
+    //生成摄像头请求链接
+    public static function makeCameraUrl($params)
+    {
+        $url  = 'rtsp://' . $params['user_name'] . ':' . $params['password'] . '@';
+        $url .= $params['ip'] . ':' . $params['port'] . '/' . 'h264' . '/' . 'ch' . $params['com_number'] . '/';
+        $url .= 'main/av_stream';
+        return $url;
+    }
+
+    //删除摄像头列表记录
+    public static function delCameraList($params)
+    {
+        $result['status'] = true;
+        $result['msg']    = AdminEnum::RETURN_SUCCESS;
+
+        //判断字段是否存在
+        $query = CameraList::find($params['id']);
+
+        if (!$query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_NOT_EXIST;
+            return $result;
+        }
+
+        $res = CameraList::where('id', $params['id'])->delete();
+
+        if (!$res) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return $result;
+    }
+
 
     //添加摄像头链接生成字段
     public static function addCameraFieldList($params)