添加字段

.idea/workspace.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="" />
+    <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.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/Mine/Http/Controllers/MineController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -14,55 +20,73 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="487">
-              <caret line="59" column="5" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
+            <state relative-caret-position="389">
+              <caret line="59" column="53" lean-forward="true" selection-start-line="58" selection-start-column="16" selection-end-line="59" selection-end-column="53" />
               <folding>
-                <element signature="e#141#162#0#PHP" expanded="true" />
+                <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="16" column="14" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
+            <state relative-caret-position="247">
+              <caret line="140" column="38" selection-start-line="140" selection-start-column="38" selection-end-line="140" selection-end-column="38" />
+              <folding>
+                <element signature="e#49#93#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="168">
-              <caret line="343" column="43" selection-start-line="343" selection-start-column="27" selection-end-line="343" selection-end-column="43" />
-              <folding>
-                <element signature="e#129#150#0#PHP" expanded="true" />
-              </folding>
+              <caret line="13" column="19" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="571">
-              <caret line="40" column="41" lean-forward="true" selection-start-line="40" selection-start-column="41" selection-end-line="40" selection-end-column="41" />
+            <state relative-caret-position="282">
+              <caret line="132" column="45" selection-start-line="132" selection-start-column="45" selection-end-line="132" selection-end-column="45" />
               <folding>
-                <element signature="e#40#71#0#PHP" expanded="true" />
+                <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/Helpers.php">
+        <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="55">
-              <caret line="89" column="29" selection-start-line="89" selection-start-column="29" selection-end-line="89" selection-end-column="29" />
+            <state relative-caret-position="304">
+              <caret line="65" column="92" lean-forward="true" selection-start-line="65" selection-start-column="92" selection-end-line="65" selection-end-column="92" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="253">
+              <caret line="87" column="20" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="357">
+              <caret line="19" column="66" lean-forward="true" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="66" />
             </state>
           </provider>
         </entry>
@@ -109,10 +133,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-15.log" />
-        <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/BaseController.php" />
-        <option value="$PROJECT_DIR$/Modules/Enum/UserEnum.php" />
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-16.log" />
         <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/Mine/Entities/MineList.php" />
@@ -142,7 +162,6 @@
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
         <option value="$PROJECT_DIR$/resources/lang/en/auth.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_26_024115_add_sort_to_camera_list_table.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
         <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
@@ -151,15 +170,20 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/Api/BaseController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log" />
         <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
         <option value="$PROJECT_DIR$/app/Helpers.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_28_111556_create_mine_list_ext_table.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php" />
+        <option value="$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TreeAuxiliary.php" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
       </list>
     </option>
   </component>
@@ -329,7 +353,7 @@
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Camera" type="462c0819:PsiDirectoryNode" />
-              <item name="Routes" type="462c0819:PsiDirectoryNode" />
+              <item name="Entities" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
@@ -342,6 +366,13 @@
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Mine" type="462c0819:PsiDirectoryNode" />
+              <item name="Entities" 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="Mine" type="462c0819:PsiDirectoryNode" />
               <item name="Routes" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
@@ -388,18 +419,18 @@
       <option name="presentableId" value="Default" />
       <updated>1618368322468</updated>
       <workItem from="1618368323697" duration="143000" />
-      <workItem from="1618368497550" duration="151978000" />
+      <workItem from="1618368497550" duration="157867000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="152121000" />
+    <option name="totallyTimeSpent" value="158010000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2532189" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2532189" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -424,58 +455,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <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$/app/Http/Middleware/Authenticate.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Kernel.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="53" column="43" lean-forward="true" selection-start-line="53" selection-start-column="43" selection-end-line="53" selection-end-column="43" />
-        </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="168">
-          <caret line="13" column="51" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="51" />
-        </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="2996">
@@ -552,23 +531,6 @@
         </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="389">
-          <caret line="192" column="25" selection-start-line="192" selection-start-column="20" selection-end-line="192" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="466">
-          <caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
-          <folding>
-            <element signature="e#49#93#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/curl/curl_d.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
@@ -614,13 +576,6 @@
         <state relative-caret-position="-412" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Enum/AdminEnum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/database/migrations/2021_04_26_100533_create_jobs_table.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -717,16 +672,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1433">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="e#127#148#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
@@ -734,9 +679,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-28.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/.env">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="656">
@@ -751,39 +693,129 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="487">
+          <caret line="59" column="5" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
+          <folding>
+            <element signature="e#141#162#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/Helpers.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="55">
-          <caret line="89" column="29" selection-start-line="89" selection-start-column="29" selection-end-line="89" selection-end-column="29" />
+        <state relative-caret-position="316">
+          <caret line="101" column="23" selection-start-line="101" selection-start-column="23" selection-end-line="101" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+    <entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="487">
-          <caret line="59" column="5" selection-start-line="59" selection-start-column="5" selection-end-line="59" selection-end-column="5" />
+        <state relative-caret-position="294">
+          <caret line="14" column="45" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="45" />
           <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
+            <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+    <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="357">
+          <caret line="19" column="66" lean-forward="true" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_28_111556_create_mine_list_ext_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="16" column="57" selection-start-line="16" selection-start-column="50" selection-end-line="16" selection-end-column="57" />
+        </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="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/Mine/Enum/MineEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="13" column="19" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
-          <caret line="343" column="43" selection-start-line="343" selection-start-column="27" selection-end-line="343" selection-end-column="43" />
+          <caret line="9" column="20" lean-forward="true" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="11" column="35" selection-end-line="13" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+        </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="389">
+          <caret line="59" column="53" lean-forward="true" selection-start-line="58" selection-start-column="16" selection-end-line="59" selection-end-column="53" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/TreeAuxiliary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="79" column="20" selection-start-line="79" selection-start-column="20" selection-end-line="79" selection-end-column="20" />
+        </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="253">
+          <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$/storage/logs/laravel-2021-04-28.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="65" column="92" lean-forward="true" selection-start-line="65" selection-start-column="92" selection-end-line="65" selection-end-column="92" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="571">
-          <caret line="40" column="41" lean-forward="true" selection-start-line="40" selection-start-column="41" selection-end-line="40" selection-end-column="41" />
+        <state relative-caret-position="247">
+          <caret line="140" column="38" selection-start-line="140" selection-start-column="38" selection-end-line="140" selection-end-column="38" />
           <folding>
-            <element signature="e#40#71#0#PHP" expanded="true" />
+            <element signature="e#49#93#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="132" column="45" selection-start-line="132" selection-start-column="45" selection-end-line="132" selection-end-column="45" />
+          <folding>
+            <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

Modules/Mine/Database/Migrations/2021_04_28_111556_create_mine_list_ext_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateMineListExtTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('mine_list_ext', function (Blueprint $table) {
+            $table->bigIncrements('id')->comment('矿区扩展信息表');
+            $table->integer('mine_id')->index()->comment('矿区id(mine_list表id)');
+            $table->string('ip', 50)->nullable()->comment('ip地址');
+            $table->string('port', 10)->nullable()->comment('端口');
+            $table->string('key', 100)->nullable()->comment('请求key');
+            $table->string('secret', 100)->nullable()->comment('请求secret');
+            $table->tinyInteger('is_hak')->default(0)->comment('是否使用海康视频服务器 0:否 1:是');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('mine_list_ext');
+    }
+}

Modules/Mine/Entities/MineListExt.php

@@ -0,0 +1,14 @@
+<?php
+namespace Modules\Mine\Entities;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class MineListExt extends Model
+{
+    use SoftDeletes;
+    protected $table        = 'mine_list_ext';
+    public    $incrementing = false;
+    protected $keyType      = 'string';
+    protected $fillable     = [];
+}

Modules/Mine/Enum/MineEnum.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiuzijian
+ * Date: 2021-04-28
+ * Time: 19:33
+ */
+
+namespace Modules\Mine\Enum;
+
+class MineEnum
+{
+    //是否使用海康视频服务器
+    const IS_HAK_NO  = 0;  //否
+    const IS_HAK_YES = 1;  //是
+}

Modules/Mine/Http/Controllers/MineController.php

@@ -5,10 +5,12 @@ namespace Modules\Mine\Http\Controllers;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Log;
 use Modules\Admin\Auxiliary\View\FromAuxiliary;
 use Modules\Admin\Auxiliary\View\TreeAuxiliary;
 use Modules\Admin\Http\Controllers\BaseController;
 use Modules\Mine\Entities\MineList;
+use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Services\MineServices;
 
 class MineController extends BaseController
@@ -28,13 +30,16 @@ class MineController extends BaseController
         $this->menusActive[0] = 'adminMine';
         $this->menusActive[1] = 'adminMineList';
 
-        $mineService = new MineServices();
-        $mineService->initMineList();
-        $list = $mineService->getTierList();
+        $list = MineServices::getAdminMineList();
 
         $tableObj = new TreeAuxiliary('mine/list', $list);
         $tableObj->column('title', '矿区单位名称');
         $tableObj->column('sort', '排序');
+        $tableObj->column('ip', 'ip');
+        $tableObj->column('port', 'port');
+        $tableObj->column('key', '请求key');
+        $tableObj->column('secret', '请求secret');
+        $tableObj->column('is_hak', '是否使用海康视频服务器');
         return $this->tree($tableObj);
     }
 
@@ -49,6 +54,11 @@ class MineController extends BaseController
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList);
         $formObj->input('title', '矿区单位名称');
         $formObj->input('sort', '排序', 1);
+        $formObj->radio('is_hak', '是否使用海康视频服务器', [MineEnum::IS_HAK_NO => '否', MineEnum::IS_HAK_YES => '是'], 0);
+        $formObj->input('ip', 'id地址');
+        $formObj->input('port', '端口');
+        $formObj->input('key', '请求key');
+        $formObj->input('secret', '请求secret');
 //        $formObj->radio('show', '是否显示', [1 => '是', 0 => '否'], 1);
         $formObj->title = '添加矿区单位';
         return $this->from($formObj);
@@ -57,32 +67,50 @@ class MineController extends BaseController
     //添加矿区单位操作
     public function mineAddPost(Request $request)
     {
-        if (!$request['title']) {
+        if (!$request->input('title')) {
             return $this->error(1, '请输入矿区单位名称');
         }
 
         $mineService = new MineServices();
         $mineService->initMineList();
-        $mineService->add($request->all());
+        $result = $mineService->add($request->all());
+        $mine_id = $result->id;
+
+        if ($request->input('is_hak') == MineEnum::IS_HAK_YES) {
+            if (!$request->input('ip') || !$request->input('port')
+                || !$request->input('key') || !$request->input('secret')
+            ) {
+                return $this->error(1, '请输入连接视频服务器必传参数');
+            }
+
+            MineServices::insertMineListExt($mine_id, $request->all());
+        }
         return $this->redirect('admin/mine/list');
     }
 
     //编辑矿区单位
     public function mineEdit(Request $request)
     {
-        if (!$request->id) {
+        if (!$request->input('id')) {
             return $this->error(1, '缺少必要参数');
         }
 
         $mineService = new MineServices();
         $mineService->initMineList();
         $titleList = $mineService->getTierList();
-        $titleOne  = $mineService->getOneInfo($request->id);
+        $titleOne  = MineServices::getAdminMineOne($request->input('id'));
 
         $formObj = new FromAuxiliary('mine/list/edit', $titleOne);
         $formObj->tree_select('parent_id', '父级矿区单位', $titleList, $titleOne->parent_id);
         $formObj->input('title', '矿区单位名称');
         $formObj->input('sort', '排序', 10);
+        if (isset($titleOne->is_hak)) {
+            $formObj->radio('is_hak', '是否使用海康视频服务器', [MineEnum::IS_HAK_NO => '否', MineEnum::IS_HAK_YES => '是'], 0);
+            $formObj->input('ip', 'id地址');
+            $formObj->input('port', '端口');
+            $formObj->input('key', '请求key');
+            $formObj->input('secret', '请求secret');
+        }
         $formObj->title = '修改矿区单位';
         return $this->from($formObj);
     }
@@ -90,7 +118,7 @@ class MineController extends BaseController
     //编辑矿区单位操作
     public function mineEditPost(Request $request)
     {
-        if (!$request->id) {
+        if (!$request->input('id')) {
             return $this->error(1, '缺少必要参数');
         }
 
@@ -102,6 +130,17 @@ class MineController extends BaseController
         }
 
         $mineService->edit($request->all());
+
+        if ($request->input('is_hak') == MineEnum::IS_HAK_YES) {
+            if (!$request->input('ip') || !$request->input('port')
+                || !$request->input('key') || !$request->input('secret')
+            ) {
+                return $this->error(1, '请输入连接视频服务器必传参数');
+            }
+
+            MineServices::editMineListExt($request->input('id'), $request->all());
+        }
+
         return $this->redirect('admin/mine/list');
     }
 

Modules/Mine/Services/MineServices.php

@@ -14,6 +14,8 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Modules\Admin\Traits\ClassifyMethod;
 use Modules\Mine\Entities\MineList;
+use Modules\Mine\Entities\MineListExt;
+use Modules\Mine\Enum\MineEnum;
 
 class MineServices{
 
@@ -105,4 +107,115 @@ class MineServices{
         }
         return $arr;
     }
+
+    //矿区扩展信息表入库
+    public static function insertMineListExt($mine_id, $params)
+    {
+        $result = MineListExt::insert(
+            [
+                'mine_id'    => $mine_id,
+                'ip'         => $params['ip'],
+                'port'       => $params['port'],
+                'key'        => $params['key'],
+                'secret'     => $params['secret'],
+                'is_hak'     => $params['is_hak'],
+                'created_at' => date('Y-m-d H:i:s'),
+                'updated_at' => date('Y-m-d H:i:s'),
+            ]
+        );
+
+        return $result;
+    }
+
+    //编辑矿区扩展信息表
+    public static function editMineListExt($mine_id, $params)
+    {
+        $result = MineListExt::where('mine_id', $mine_id)->update(
+            [
+                'ip'         => $params['ip'],
+                'port'       => $params['port'],
+                'key'        => $params['key'],
+                'secret'     => $params['secret'],
+                'is_hak'     => $params['is_hak'],
+                'created_at' => date('Y-m-d H:i:s'),
+                'updated_at' => date('Y-m-d H:i:s'),
+            ]
+        );
+
+        return $result;
+    }
+
+    //查询后台矿区列表
+    public static function getAdminMineList()
+    {
+        $mine_list = MineList::orderBy('sort', 'desc')->get()->toArray();
+        if ($mine_list) {
+            $result = self::sortMineListExt($mine_list);
+            foreach ($result as $key => $val) {
+                if (isset($val['child'])) {
+                    $sort = array_column($val['child'], 'sort');
+                    array_multisort($sort, SORT_ASC, $val['child']);
+                }
+            }
+            return $result;
+        }
+        return [];
+    }
+
+    //递归查询矿区扩展信息
+    public static function sortMineListExt($mine_list, $pid = '0')
+    {
+        $arr = [];
+        if (empty($mine_list)) {
+            return [];
+        }
+        $num = 0;
+        foreach ($mine_list as $key => $val) {
+            if ($val['parent_id'] == $pid) {
+                $arr[$num]          = $val;
+                $query = MineListExt::where('mine_id', $val['id'])->first();
+                if ($query) {
+                    $arr[$num]['ip']     = $query->ip;
+                    $arr[$num]['port']   = $query->port;
+                    $arr[$num]['key']    = $query->key;
+                    $arr[$num]['secret'] = $query->secret;
+                    $arr[$num]['is_hak'] = $query->is_hak == MineEnum::IS_HAK_YES ? '是' : '否';
+                } else {
+                    $arr[$num]['ip']     = '';
+                    $arr[$num]['port']   = '';
+                    $arr[$num]['key']    = '';
+                    $arr[$num]['secret'] = '';
+                    $arr[$num]['is_hak'] = '否';
+                }
+                $arr[$num]['child'] = self::sortMineListExt($mine_list, $val['id']);
+                if (count($arr[$num]['child']) == 0) {
+                    unset($arr[$num]['child']);
+                }
+                $num++;
+            }
+        }
+        return $arr;
+    }
+
+    //查询后台单个矿区
+    public static function getAdminMineOne($mine_id)
+    {
+        $mine_list = MineList::leftJoin(
+            'mine_list_ext', 'mine_list.id', '=', 'mine_list_ext.mine_id'
+            )->where('mine_list.id', $mine_id)->select(
+                [
+                    'mine_list.id',
+                    'mine_list.parent_id',
+                    'mine_list.title',
+                    'mine_list.sort',
+                    'mine_list_ext.ip',
+                    'mine_list_ext.port',
+                    'mine_list_ext.key',
+                    'mine_list_ext.secret',
+                    'mine_list_ext.is_hak'
+                ]
+        )->first();
+
+        return $mine_list;
+    }
 }