修改工作面后台

.idea/workspace.xml

@@ -2,10 +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/Mine/Entities/WorkingSurface.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurfaceCamera.php" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.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/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.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$/Modules/Mine/Entities/WorkingSurface.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/web.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" />
@@ -21,8 +25,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="16" column="19" lean-forward="true" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
+            <state relative-caret-position="613">
+              <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
             </state>
           </provider>
         </entry>
@@ -30,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="549">
-              <caret line="235" column="40" selection-start-line="235" selection-start-column="40" selection-end-line="235" selection-end-column="40" />
+            <state relative-caret-position="527">
+              <caret line="275" column="40" selection-start-line="275" selection-start-column="40" selection-end-line="275" selection-end-column="40" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -39,70 +43,68 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="404">
-              <caret line="66" column="47" selection-start-line="66" selection-start-column="47" selection-end-line="66" selection-end-column="47" />
+            <state relative-caret-position="487">
+              <caret line="140" column="35" selection-start-line="140" selection-start-column="35" selection-end-line="140" selection-end-column="35" />
               <folding>
-                <element signature="e#141#162#0#PHP" expanded="true" />
+                <element signature="e#135#163#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="578">
-              <caret line="704" column="141" selection-start-line="704" selection-start-column="141" selection-end-line="704" selection-end-column="141" />
-              <folding>
-                <element signature="e#129#150#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="462">
+              <caret line="31" column="70" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="70" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_26_074955_create_working_surface_table.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="13" column="24" lean-forward="true" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+            <state relative-caret-position="462">
+              <caret line="164" column="9" lean-forward="true" selection-start-line="157" selection-start-column="8" selection-end-line="164" selection-end-column="9" />
+              <folding>
+                <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/Mine/Routes/web.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="25" column="62" selection-start-line="25" selection-start-column="51" selection-end-line="25" selection-end-column="62" />
+            <state relative-caret-position="283">
+              <caret line="39" column="27" selection-start-line="39" selection-start-column="27" selection-end-line="39" selection-end-column="27" />
+              <folding>
+                <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$/Modules/Mine/Http/Controllers/SurfaceController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="365">
-              <caret line="27" column="39" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
+            <state relative-caret-position="251">
+              <caret line="108" column="35" selection-start-line="108" selection-start-column="35" selection-end-line="108" selection-end-column="35" />
+              <folding>
+                <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$/Modules/Mine/Entities/WorkingSurface.php">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="169">
-              <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-              <folding>
-                <element signature="e#49#93#0#PHP" expanded="true" />
-              </folding>
+            <state relative-caret-position="105">
+              <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -111,8 +113,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>formSelects:</find>
-      <find>formSelects</find>
       <find>sendLoginResponse</find>
       <find>queue:work</find>
       <find>queue</find>
@@ -141,6 +141,8 @@
       <find>updateOrCreate</find>
       <find>VIDEO_SYSTEM_URL</find>
       <find>getCamerasUrl</find>
+      <find>select</find>
+      <find>title</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -149,11 +151,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_20_082221_create_camera_list_table.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" />
-        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-22.log" />
         <option value="$PROJECT_DIR$/storage/app/menulist.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
@@ -170,7 +167,6 @@
         <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$/app/Http/Controllers/Api/BaseController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log" />
@@ -188,18 +184,24 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
         <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_26_074955_create_working_surface_table.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$/Modules/Mine/Entities/WorkingSurface.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
+        <option value="$PROJECT_DIR$/storage/logs/laravel-2021-05-31.log" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurfaceCamera.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_31_023512_create_working_sruface_camera_table.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Routes/web.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
       </list>
     </option>
   </component>
@@ -424,6 +426,13 @@
             <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="Services" 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>
@@ -476,7 +485,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="275775000" />
+    <option name="totallyTimeSpent" value="288147000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -507,56 +516,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Jobs/CameraListExcel1.php" />
-    <entry file="file://$PROJECT_DIR$/vendor/predis/predis/src/Client.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="40" column="6" selection-start-line="40" selection-start-column="6" selection-end-line="40" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/queue.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="63" column="28" selection-start-line="63" selection-start-column="28" selection-end-line="63" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Routing/Controller.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="15" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-04-27.log">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="29" column="14" selection-start-line="29" selection-start-column="3" selection-end-line="29" selection-end-column="14" />
-        </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/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/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$/vendor/laravel/framework/src/Illuminate/Support/helpers.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
@@ -668,13 +627,6 @@
         </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="210">
-          <caret line="11" column="113" selection-start-line="11" selection-start-column="113" selection-end-line="11" selection-end-column="113" />
-        </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="294">
@@ -748,43 +700,53 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_05_26_020632_add_field_to_camera_list_0526.php">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="256" column="27" selection-start-line="256" selection-start-column="27" selection-end-line="256" selection-end-column="27" />
+        <state relative-caret-position="190">
+          <caret line="26" column="42" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="42" />
           <folding>
-            <element signature="e#127#148#0#PHP" expanded="true" />
+            <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_05_26_020632_add_field_to_camera_list_0526.php">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="274">
+          <caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
+          <folding>
+            <element signature="e#126#164#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+        <state relative-caret-position="388">
+          <caret line="203" column="27" lean-forward="true" selection-start-line="203" selection-start-column="27" selection-end-line="203" selection-end-column="27" />
           <folding>
-            <element signature="e#139#160#0#PHP" expanded="true" />
+            <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="26" column="42" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="42" />
+        <state relative-caret-position="320">
+          <caret line="62" column="23" lean-forward="true" selection-start-line="62" selection-start-column="23" selection-end-line="62" selection-end-column="23" />
           <folding>
-            <element signature="e#40#71#0#PHP" expanded="true" />
+            <element signature="e#141#162#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineListExt.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="16" column="19" lean-forward="true" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
+        <state relative-caret-position="21">
+          <caret line="1" selection-start-line="1" selection-end-line="13" selection-end-column="1" />
         </state>
       </provider>
     </entry>
@@ -795,82 +757,138 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/MineList.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
-          <folding>
-            <element signature="e#126#164#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="189">
+          <caret line="10" column="33" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="203" column="27" lean-forward="true" selection-start-line="203" selection-start-column="27" selection-end-line="203" selection-end-column="27" />
+        <state relative-caret-position="260">
+          <caret line="31" column="55" selection-start-line="31" selection-start-column="55" selection-end-line="31" selection-end-column="55" />
           <folding>
-            <element signature="e#141#185#0#PHP" expanded="true" />
+            <element signature="e#139#160#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="549">
-          <caret line="235" column="40" selection-start-line="235" selection-start-column="40" selection-end-line="235" selection-end-column="40" />
-          <folding>
-            <element signature="e#51#107#0#PHP" expanded="true" />
-          </folding>
+        <state relative-caret-position="260">
+          <caret line="166" column="53" selection-start-line="166" selection-start-column="45" selection-end-line="166" selection-end-column="53" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
+    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-05-31.log">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="25" column="62" selection-start-line="25" selection-start-column="51" selection-end-line="25" selection-end-column="62" />
+        <state relative-caret-position="105">
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
+    <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" />
+        </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="365">
-          <caret line="27" column="39" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
+        <state relative-caret-position="272">
+          <caret line="202" column="39" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php">
-      <provider selected="true" editor-type-id="text-editor" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="13" column="1" lean-forward="true" selection-start-line="1" selection-end-line="13" selection-end-column="1" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurfaceCamera.php">
+      <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/Camera/Enum/CameraEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="613">
+          <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_31_023512_create_working_sruface_camera_table.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="18" column="84" selection-start-line="18" selection-start-column="84" selection-end-line="18" selection-end-column="84" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/web.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="462">
+          <caret line="31" column="70" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="70" />
+        </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="169">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+        <state relative-caret-position="283">
+          <caret line="39" column="27" selection-start-line="39" selection-start-column="27" selection-end-line="39" selection-end-column="27" />
           <folding>
-            <element signature="e#49#93#0#PHP" expanded="true" />
+            <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="66" column="47" selection-start-line="66" selection-start-column="47" selection-end-line="66" selection-end-column="47" />
+        <state relative-caret-position="527">
+          <caret line="275" column="40" selection-start-line="275" selection-start-column="40" selection-end-line="275" selection-end-column="40" />
           <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
+            <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
         </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="578">
-          <caret line="704" column="141" selection-start-line="704" selection-start-column="141" selection-end-line="704" selection-end-column="141" />
+        <state relative-caret-position="462">
+          <caret line="164" column="9" lean-forward="true" selection-start-line="157" selection-start-column="8" selection-end-line="164" selection-end-column="9" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="251">
+          <caret line="108" column="35" selection-start-line="108" selection-start-column="35" selection-end-line="108" selection-end-column="35" />
+          <folding>
+            <element signature="e#127#148#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="487">
+          <caret line="140" column="35" selection-start-line="140" selection-start-column="35" selection-end-line="140" selection-end-column="35" />
+          <folding>
+            <element signature="e#135#163#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

Modules/Camera/Http/Controllers/CameraController.php

@@ -17,7 +17,10 @@ use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Jobs\CameraListExcel;
 use Modules\Camera\Services\CameraServices;
 use Modules\Mine\Entities\MineList;
+use Modules\Mine\Entities\WorkingSurface;
+use Modules\Mine\Entities\WorkingSurfaceCamera;
 use Modules\Mine\Services\MineServices;
+use Modules\Mine\Services\SurfaceServices;
 
 class CameraController extends BaseController
 {
@@ -110,7 +113,13 @@ class CameraController extends BaseController
             'mine_list.degree'
         )->first();
 
-        $camera_list->parent_title = MineList::where('id', explode('|', $camera_list->degree)[0])->value('title');
+        //工作面列表
+        $working_surface = WorkingSurfaceCamera::join(
+            'working_surface', 'working_surface_camera.surface_id', '=', 'working_surface.id'
+        )->where('working_surface_camera.camera_id', $request->input('id'))->value('surface_name');
+
+        $camera_list->parent_title    = MineList::where('id', explode('|', $camera_list->degree)[0])->value('title');
+        $camera_list->working_surface = $working_surface;
 
         $tableObj = new TableAuxiliary('', $camera_list);
         $tableObj->column('parent_title', '矿区名称');
@@ -127,6 +136,7 @@ class CameraController extends BaseController
         $tableObj->column('com_number', '通道号');
         $tableObj->column('camera_url', '链接');
         $tableObj->column('sort', '排序');
+        $tableObj->column('working_surface', '所属工作面');
         $tableObj->title = '摄像头链接详情';
         return $this->tableView($tableObj);
     }
@@ -195,7 +205,17 @@ class CameraController extends BaseController
         $mineService->initMineList();
         $titleList = $mineService->getTierList();
 
-        $camera_list = CameraList::find($id);
+        $camera_list  = CameraList::find($id);
+
+        //工作面列表
+        $degree       = MineList::where('id', $camera_list->mine_id)->value('degree');
+        $parent_id    = explode('|', $degree)[0];
+        $surface_list = WorkingSurface::where('mine_id', $parent_id)->get()->toArray();
+        $surface_arr  = [];
+        foreach ($surface_list as $key => $val) {
+            $surface_arr[$val['id']] = $val['surface_name'];
+        }
+        $default_surface = WorkingSurfaceCamera::where('camera_id', $id)->value('surface_id');
 
         $formObj = new FromAuxiliary('camera/list/edit', $camera_list);
         $formObj->tree_select('mine_id', '矿区单位', $titleList);
@@ -207,6 +227,7 @@ class CameraController extends BaseController
         $formObj->input('port', '端口');
         $formObj->input('com_number', '通道号');
         $formObj->input('sort', '排序');
+        $formObj->select('surface_id', '所属工作面', $surface_arr, $default_surface);
         $formObj->title = '编辑请求链接';
         return $this->from($formObj);
     }
@@ -239,6 +260,9 @@ class CameraController extends BaseController
             return $this->error(1, $result['msg']);
         }
 
+        //更新摄像头与工作面关联表
+        SurfaceServices::updateSrufaceCamera($request->all());
+
         return $this->redirect('admin/camera/list');
     }
 

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

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateWorkingSrufaceCameraTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('working_surface_camera', function (Blueprint $table) {
+            $table->bigIncrements('id')->comment('工作面 - 摄像头关联表');
+            $table->integer('surface_id')->index()->comment('工作面id(working_surface表id)');
+            $table->integer('camera_id')->index()->comment('摄像头id(camera_list表id)');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('working_surface_camera');
+    }
+}

Modules/Mine/Entities/WorkingSurface.php

@@ -1,7 +1,14 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: qiuzijian
- * Date: 2021-05-28
- * Time: 17:10
- */
+namespace Modules\Mine\Entities;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class WorkingSurface extends Model
+{
+    use SoftDeletes;
+    protected $table        = 'working_surface';
+    public    $incrementing = false;
+    protected $keyType      = 'string';
+    protected $fillable     = [];
+}

Modules/Mine/Entities/WorkingSurfaceCamera.php

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

Modules/Mine/Http/Controllers/SurfaceController.php

@@ -8,7 +8,15 @@
 
 namespace Modules\Mine\Http\Controllers;
 
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Modules\Admin\Auxiliary\View\FromAuxiliary;
+use Modules\Admin\Auxiliary\View\TableAuxiliary;
+use Modules\Admin\Auxiliary\View\TreeAuxiliary;
 use Modules\Admin\Http\Controllers\BaseController;
+use Modules\Mine\Entities\WorkingSurface;
+use Modules\Mine\Services\MineServices;
+use Modules\Mine\Services\SurfaceServices;
 
 class SurfaceController extends BaseController
 {
@@ -27,16 +35,114 @@ class SurfaceController extends BaseController
         $this->menusActive[0] = 'adminSurface';
         $this->menusActive[1] = 'adminSurfaceList';
 
-        $list = MineServices::getAdminMineList();
+        $list = SurfaceServices::getSurfaceList();
 
-        $tableObj = new TreeAuxiliary('mine/list', $list);
+        $tableObj = new TableAuxiliary('surface/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);
+        $tableObj->column('surface_name', '工作面名称');
+        return $this->tableList($tableObj);
+    }
+
+    //查看工作面
+    public function surfaceView(Request $request)
+    {
+        if (!$request->has('id')) {
+            return $this->redirect('admin/surface/list');
+        }
+
+        $this->menusActive[0] = 'adminSurface';
+        $this->menusActive[1] = 'adminSurfaceList';
+
+        $list = SurfaceServices::getSrufaceDetail($request->input('id'));
+
+        $tableObj = new TableAuxiliary('surface/list/view', $list);
+        $tableObj->column('title', '矿区单位名称');
+        $tableObj->column('surface_name', '工作面名称');
+        return $this->tableView($tableObj);
+    }
+
+    //添加工作面
+    public function surfaceAdd(Request $request)
+    {
+        $titleList = MineServices::getMineList();
+        $titleArr  = [];
+        foreach ($titleList['data'] as $key => $val) {
+            $titleArr[$val['id']] = $val['name'];
+        }
+
+        $formObj = new FromAuxiliary('surface/list/add');
+        $formObj->select('mine_id', '矿区单位', $titleArr);
+        $formObj->input('surface_name', '工作面名称');
+        $formObj->title = '添加矿区工作面';
+        return $this->from($formObj);
+    }
+
+    //添加工作面操作
+    public function surfaceAddPost(Request $request)
+    {
+        if (!$request->input('mine_id') || !$request->input('surface_name')) {
+            return $this->error(1, '必填参数不能为空');
+        }
+
+        $result = SurfaceServices::addSurfaceList($request->all());
+
+        if (!$result['status']) {
+            return $this->error(1, $result['msg']);
+        }
+
+        return $this->redirect('admin/surface/list');
+    }
+
+    //编辑工作面
+    public function surfaceEdit(Request $request)
+    {
+        if (!$request->input('id')) {
+            return $this->redirect('admin/surface/list');
+        }
+
+        $surface = WorkingSurface::find($request->input('id'));
+
+        $titleList = MineServices::getMineList();
+        $titleArr  = [];
+        foreach ($titleList['data'] as $key => $val) {
+            $titleArr[$val['id']] = $val['name'];
+        }
+
+        $formObj = new FromAuxiliary('surface/list/edit', $surface);
+        $formObj->select('mine_id', '矿区单位', $titleArr);
+        $formObj->input('surface_name', '工作面名称');
+        $formObj->title = '编辑矿区工作面';
+        return $this->from($formObj);
+    }
+
+    //编辑工作面操作
+    public function surfaceEditPost(Request $request)
+    {
+        if (!$request->input('mine_id') || !$request->input('surface_name')) {
+            return $this->error(1, '必填参数不能为空');
+        }
+
+        $result = SurfaceServices::editSurfaceList($request->all());
+
+        if (!$result['status']) {
+            return $this->error(1, $result['msg']);
+        }
+
+        return $this->redirect('admin/surface/list');
+    }
+
+    //删除工作面操作
+    public function surfaceDelPost(Request $request)
+    {
+        if (!$request->has('id')) {
+            return $this->error(1, '缺少必要参数');
+        }
+
+        $result = SurfaceServices::delSurfaceList($request->all());
+
+        if (!$result['status']) {
+            return $this->error(1, $result['msg']);
+        }
+        return $this->success();
     }
 }

Modules/Mine/Routes/web.php

@@ -24,4 +24,10 @@ Route::prefix('admin')->group(function() {
     //工作面
     Route::get('/surface', 'SurfaceController@index');
     Route::get('/surface/list', 'SurfaceController@surfaceList');
+    Route::get('/surface/list/view', 'SurfaceController@surfaceView');
+    Route::get('/surface/list/add', 'SurfaceController@surfaceAdd');
+    Route::post('/surface/list/add', 'SurfaceController@surfaceAddPost');
+    Route::get('/surface/list/edit', 'SurfaceController@surfaceEdit');
+    Route::post('/surface/list/edit', 'SurfaceController@surfaceEditPost');
+    Route::post('/surface/list/del', 'SurfaceController@surfaceDelPost');
 });

Modules/Mine/Services/MineServices.php

@@ -37,7 +37,7 @@ class MineServices{
     }
 
     //获取矿井列表
-    public static function getMineList($mine_code)
+    public static function getMineList($mine_code = '')
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;

Modules/Mine/Services/SurfaceServices.php

@@ -0,0 +1,158 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiuzijian
+ * Date: 2021-05-31
+ * Time: 09:20
+ */
+
+namespace Modules\Mine\Services;
+
+use App\Enum\ApiEnum;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Log;
+use Modules\Admin\Enum\AdminEnum;
+use Modules\Camera\Enum\CameraEnum;
+use Modules\Mine\Entities\WorkingSurface;
+use Modules\Mine\Entities\WorkingSurfaceCamera;
+
+class SurfaceServices{
+
+    //获取工作面列表
+    public static function getSurfaceList()
+    {
+        $query = WorkingSurface::join(
+            'mine_list', 'working_surface.mine_id', '=', 'mine_list.id'
+        )->orderBy('working_surface.created_at', 'desc')->select(
+            [
+                'working_surface.id',
+                'working_surface.surface_name',
+                'mine_list.title'
+            ]
+        )->get();
+
+        return $query;
+    }
+
+    //查询工作面详情
+    public static function getSrufaceDetail($surface_id)
+    {
+        $query = WorkingSurface::join(
+            'mine_list', 'working_surface.mine_id', '=', 'mine_list.id'
+        )->where('working_surface.id', $surface_id)->select(
+            [
+                'mine_list.title',
+                'working_surface.surface_name'
+            ]
+        )->first();
+
+        return $query;
+    }
+
+    //添加工作面操作
+    public static function addSurfaceList($params)
+    {
+        $result['status'] = true;
+        $result['msg']    = AdminEnum::RETURN_SUCCESS;
+
+        $res = WorkingSurface::insert(
+            [
+                'mine_id'      => $params['mine_id'],
+                'surface_name' => $params['surface_name'],
+                'created_at'   => date('Y-m-d H:i:s', time()),
+                'updated_at'   => date('Y-m-d H:i:s', time()),
+            ]
+        );
+
+        if (!$res) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return $result;
+    }
+
+    //编辑工作面操作
+    public static function editSurfaceList($params)
+    {
+        $result['status'] = true;
+        $result['msg']    = AdminEnum::RETURN_SUCCESS;
+
+        //判断数据是否存在
+        $query = WorkingSurface::find($params['id']);
+
+        if (!$query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_NOT_EXIST;
+            return $result;
+        }
+
+        $res = WorkingSurface::where('id', $params['id'])->update(
+            [
+                'mine_id'      => $params['mine_id'],
+                'surface_name' => $params['surface_name'],
+                'updated_at'   => date('Y-m-d H:i:s', time()),
+            ]
+        );
+
+        if (!$res) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return $result;
+    }
+
+    //删除工作面操作
+    public static function delSurfaceList($params)
+    {
+        $result['status'] = true;
+        $result['msg']    = AdminEnum::RETURN_SUCCESS;
+
+        //判断数据是否存在
+        $query = WorkingSurface::find($params['id']);
+
+        if (!$query) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::RECORD_NOT_EXIST;
+            return $result;
+        }
+
+        $res = WorkingSurface::where('id', $params['id'])->delete();
+
+        if (!$res) {
+            $result['status'] = false;
+            $result['msg']    = AdminEnum::DATABASE_ERROR;
+        }
+
+        return $result;
+    }
+
+    //更新摄像头与工作面关联
+    public static function updateSrufaceCamera($params)
+    {
+        $query = WorkingSurfaceCamera::where('camera_id', $params['id'])->exists();
+
+        if (!$query) {
+            if ($params['surface_id']) {
+                WorkingSurfaceCamera::insert(
+                    [
+                        'surface_id' => $params['surface_id'],
+                        'camera_id'  => $params['id'],
+                        'created_at' => date('Y-m-d H:i:s', time()),
+                        'updated_at' => date('Y-m-d H:i:s', time()),
+                    ]
+                );
+            }
+        } else {
+            WorkingSurfaceCamera::where('camera_id', $params['id'])->update(
+                [
+                    'surface_id' => $params['surface_id'],
+                    'updated_at' => date('Y-m-d H:i:s', time()),
+                ]
+            );
+        }
+    }
+}