Browse Source

添加煤场摄像头

qiuzijian 4 years ago
parent
commit
b8157c9e28

+ 120 - 131
.idea/workspace.xml

@@ -2,8 +2,13 @@
 <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/Enum/SurfaceEnum.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/Api/CameraApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.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/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.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/Services/SurfaceServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -19,29 +24,32 @@
       <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="316">
-              <caret line="40" column="26" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="26" />
+            <state relative-caret-position="232">
+              <caret line="37" column="25" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="25" />
             </state>
           </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/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="445">
-              <caret line="73" column="47" selection-start-line="73" selection-start-column="47" selection-end-line="73" selection-end-column="47" />
+            <state relative-caret-position="556">
+              <caret line="138" column="52" selection-start-line="138" selection-start-column="52" selection-end-line="138" selection-end-column="52" />
               <folding>
-                <element signature="e#141#162#0#PHP" expanded="true" />
+                <element signature="e#51#107#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/Camera/Http/Controllers/Api/CameraApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+            <state relative-caret-position="610">
+              <caret line="47" column="51" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
+              <folding>
+                <element signature="e#141#162#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -49,8 +57,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="298">
-              <caret line="56" column="11" lean-forward="true" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
+            <state relative-caret-position="445">
+              <caret line="64" column="18" lean-forward="true" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="18" />
               <folding>
                 <element signature="e#139#160#0#PHP" expanded="true" />
               </folding>
@@ -58,13 +66,13 @@
           </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/Http/Controllers/SurfaceController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="597">
-              <caret line="385" column="18" selection-start-line="385" selection-start-column="18" selection-end-line="385" selection-end-column="18" />
+            <state relative-caret-position="314">
+              <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
               <folding>
-                <element signature="e#129#150#0#PHP" expanded="true" />
+                <element signature="e#135#163#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -73,8 +81,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="173" column="71" selection-start-line="173" selection-start-column="71" selection-end-line="173" selection-end-column="71" />
+            <state relative-caret-position="537">
+              <caret line="189" lean-forward="true" selection-start-line="189" selection-end-line="189" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -124,8 +132,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/storage/app/menulist.php" />
-        <option value="$PROJECT_DIR$/Modules/Admin/Services/MenusService.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-23.log" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-25.log" />
         <option value="$PROJECT_DIR$/resources/lang/en/auth.php" />
@@ -165,16 +171,18 @@
         <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/Mine/Http/Controllers/SurfaceController.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_06_07_065202_add_field_to_working_surface_0607.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Enum/SurfaceEnum.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.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/Camera/Http/Controllers/CameraController.php" />
       </list>
     </option>
   </component>
@@ -318,86 +326,63 @@
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Console" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Console" type="462c0819:PsiDirectoryNode" />
-              <item name="Commands" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Enum" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Http" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
-              <item name="video_system" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="Http" type="462c0819:PsiDirectoryNode" />
-              <item name="Controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="Modules" 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="Camera" 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="Camera" type="462c0819:PsiDirectoryNode" />
+              <item name="Routes" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
-              <item name="Admin" type="462c0819:PsiDirectoryNode" />
-              <item name="Database" type="462c0819:PsiDirectoryNode" />
+              <item name="Mine" 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="Mine" type="462c0819:PsiDirectoryNode" />
               <item name="Database" type="462c0819:PsiDirectoryNode" />
-              <item name="Seeders" 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="Mine" type="462c0819:PsiDirectoryNode" />
+              <item name="Database" type="462c0819:PsiDirectoryNode" />
+              <item name="Migrations" 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="Camera" type="462c0819:PsiDirectoryNode" />
+              <item name="Mine" type="462c0819:PsiDirectoryNode" />
+              <item name="Enum" 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="Camera" type="462c0819:PsiDirectoryNode" />
-              <item name="Routes" type="462c0819:PsiDirectoryNode" />
+              <item name="Mine" type="462c0819:PsiDirectoryNode" />
+              <item name="Http" 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="Http" type="462c0819:PsiDirectoryNode" />
+              <item name="Controllers" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
@@ -461,7 +446,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="297764000" />
+    <option name="totallyTimeSpent" value="302473000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -492,30 +477,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/MineEnum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
-        </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$/vendor/nesbot/carbon/src/Carbon/Translator.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="341">
-          <caret line="324" column="11" selection-start-line="324" selection-start-column="11" selection-end-line="324" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-05-08.log">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$USER_HOME$/Downloads/php/lc_open_accesstoken_sample.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -695,13 +656,6 @@
     <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="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/Admin/Http/Controllers/BaseController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="491">
@@ -775,33 +729,55 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
+    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="129" lean-forward="true" selection-start-line="129" selection-end-line="129" />
+        <state relative-caret-position="210">
+          <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
           <folding>
-            <element signature="e#135#163#0#PHP" expanded="true" />
+            <element signature="e#126#164#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+    <entry file="file://$PROJECT_DIR$/composer.json">
       <provider selected="true" editor-type-id="text-editor">
-        <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>
+        <state relative-caret-position="231">
+          <caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_06_07_065202_add_field_to_working_surface_0607.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="16" column="83" selection-start-line="16" selection-start-column="83" selection-end-line="16" selection-end-column="83" />
+        </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="210">
-          <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
-          <folding>
-            <element signature="e#126#164#0#PHP" expanded="true" />
-          </folding>
+          <caret line="15" selection-start-line="8" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/SurfaceEnum.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="17" column="36" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="36" />
+        </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="-489">
+          <caret line="5" column="28" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
         </state>
       </provider>
     </entry>
@@ -812,56 +788,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+        <state relative-caret-position="537">
+          <caret line="189" lean-forward="true" selection-start-line="189" selection-end-line="189" />
+          <folding>
+            <element signature="e#127#148#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="173" column="71" selection-start-line="173" selection-start-column="71" selection-end-line="173" selection-end-column="71" />
+        <state relative-caret-position="314">
+          <caret line="52" column="27" lean-forward="true" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
           <folding>
-            <element signature="e#127#148#0#PHP" expanded="true" />
+            <element signature="e#135#163#0#PHP" expanded="true" />
           </folding>
         </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="316">
-          <caret line="40" column="26" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="26" />
+        <state relative-caret-position="232">
+          <caret line="37" column="25" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="25" />
         </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/CameraApiController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="56" column="11" lean-forward="true" selection-start-line="56" selection-start-column="11" selection-end-line="56" selection-end-column="11" />
+        <state relative-caret-position="610">
+          <caret line="47" column="51" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
           <folding>
-            <element signature="e#139#160#0#PHP" expanded="true" />
+            <element signature="e#141#162#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/Services/CameraServices.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="31">
+          <caret line="266" column="126" selection-start-line="266" selection-start-column="115" selection-end-line="266" selection-end-column="126" />
+          <folding>
+            <element signature="e#129#150#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="445">
-          <caret line="73" column="47" selection-start-line="73" selection-start-column="47" selection-end-line="73" selection-end-column="47" />
+          <caret line="64" column="18" lean-forward="true" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="18" />
           <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
+            <element signature="e#139#160#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/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="597">
-          <caret line="385" column="18" selection-start-line="385" selection-start-column="18" selection-end-line="385" selection-end-column="18" />
+        <state relative-caret-position="556">
+          <caret line="138" column="52" selection-start-line="138" selection-start-column="52" selection-end-line="138" selection-end-column="52" />
           <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
+            <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>

+ 1 - 1
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -35,7 +35,7 @@ class CameraApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        if ($camera_type == CameraEnum::CAMERA_TYPE_WORK && !$surface_id) {
+        if (!in_array($camera_type, [CameraEnum::CAMERA_TYPE_NORMAL, CameraEnum::CAMERA_TYPE_ALL]) && !$surface_id) {
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 

+ 2 - 2
Modules/Camera/Http/Controllers/CameraController.php

@@ -136,7 +136,7 @@ class CameraController extends BaseController
         $tableObj->column('com_number', '通道号');
         $tableObj->column('camera_url', '链接');
         $tableObj->column('sort', '排序');
-        $tableObj->column('working_surface', '所属工作面');
+        $tableObj->column('working_surface', '所属矿区区域');
         $tableObj->title = '摄像头链接详情';
         return $this->tableView($tableObj);
     }
@@ -227,7 +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->select('surface_id', '所属矿区区域', $surface_arr, $default_surface);
         $formObj->title = '编辑请求链接';
         return $this->from($formObj);
     }

+ 38 - 0
Modules/Mine/Database/Migrations/2021_06_07_065202_add_field_to_working_surface_0607.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddFieldToWorkingSurface0607 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('working_surface', function (Blueprint $table) {
+            $table->tinyInteger('working_area')->default('1')->after('surface_name')->comment('矿井区域 1:默认 2:关键区域 3:工作面 4:物资 5:煤场');
+        });
+
+        \Modules\Mine\Entities\WorkingSurface::where('id', '>', 0)->update(
+            [
+                'working_area' => 3
+            ]
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('working_surface', function (Blueprint $table) {
+            $table->dropColumn('working_area');
+        });
+    }
+}

+ 27 - 0
Modules/Mine/Enum/SurfaceEnum.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiuzijian
+ * Date: 2021-06-07
+ * Time: 15:12
+ */
+
+namespace Modules\Mine\Enum;
+
+class SurfaceEnum
+{
+    //矿区区域类型
+    const WORKING_AREA_NORMAL   = '1';  //默认
+    const WORKING_AREA_AREA     = '2';  //关键区域
+    const WORKING_AREA_WORK     = '3';  //工作面
+    const WORKING_AREA_MATERIAL = '4';  //物资
+    const WORKING_AREA_COALYARD = '5';  //煤场
+
+    //矿区区域列表
+    const WORKING_AREA_LIST = [
+        self::WORKING_AREA_AREA     => '关键区域',
+        self::WORKING_AREA_WORK     => '工作面',
+        self::WORKING_AREA_MATERIAL => '物资',
+        self::WORKING_AREA_COALYARD => '煤场',
+    ];
+}

+ 4 - 1
Modules/Mine/Http/Controllers/Api/MineApiController.php

@@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Log;
 use Modules\Camera\Http\Controllers\Api\HaiKangController;
 use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Enum\MineEnum;
+use Modules\Mine\Enum\SurfaceEnum;
 use Modules\Mine\Services\MineServices;
 use Modules\Mine\Services\SurfaceServices;
 
@@ -66,7 +67,9 @@ class MineApiController extends BaseController
      */
     public function getSurfaceList()
     {
-        $result = SurfaceServices::getApiSurfaceList();
+        $working_area = Input::get('area_type', SurfaceEnum::WORKING_AREA_WORK);
+
+        $result = SurfaceServices::getApiSurfaceList($working_area);
 
         return self::successResponse($result);
     }

+ 17 - 8
Modules/Mine/Http/Controllers/SurfaceController.php

@@ -15,6 +15,7 @@ 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\Enum\SurfaceEnum;
 use Modules\Mine\Services\MineServices;
 use Modules\Mine\Services\SurfaceServices;
 
@@ -39,7 +40,10 @@ class SurfaceController extends BaseController
 
         $tableObj = new TableAuxiliary('surface/list', $list);
         $tableObj->column('title', '矿区单位名称');
-        $tableObj->column('surface_name', '工作面名称');
+        $tableObj->column('working_area', '矿区区域类型', function ($working_area) {
+            return SurfaceEnum::WORKING_AREA_LIST[$working_area];
+        });
+        $tableObj->column('surface_name', '矿区区域名称');
         return $this->tableList($tableObj);
     }
 
@@ -57,7 +61,10 @@ class SurfaceController extends BaseController
 
         $tableObj = new TableAuxiliary('surface/list/view', $list);
         $tableObj->column('title', '矿区单位名称');
-        $tableObj->column('surface_name', '工作面名称');
+        $tableObj->column('working_area', '矿区区域类型', function ($working_area) {
+            return SurfaceEnum::WORKING_AREA_LIST[$working_area];
+        });
+        $tableObj->column('surface_name', '矿区区域名称');
         return $this->tableView($tableObj);
     }
 
@@ -72,15 +79,16 @@ class SurfaceController extends BaseController
 
         $formObj = new FromAuxiliary('surface/list/add');
         $formObj->select('mine_id', '矿区单位', $titleArr);
-        $formObj->input('surface_name', '工作面名称');
-        $formObj->title = '添加矿区工作面';
+        $formObj->select('working_area', '矿区区域类型', SurfaceEnum::WORKING_AREA_LIST);
+        $formObj->input('surface_name', '矿区区域名称');
+        $formObj->title = '添加矿区区域';
         return $this->from($formObj);
     }
 
     //添加工作面操作
     public function surfaceAddPost(Request $request)
     {
-        if (!$request->input('mine_id') || !$request->input('surface_name')) {
+        if (!$request->input('mine_id') || !$request->input('surface_name') || !$request->input('working_area')) {
             return $this->error(1, '必填参数不能为空');
         }
 
@@ -110,15 +118,16 @@ class SurfaceController extends BaseController
 
         $formObj = new FromAuxiliary('surface/list/edit', $surface);
         $formObj->select('mine_id', '矿区单位', $titleArr);
-        $formObj->input('surface_name', '工作面名称');
-        $formObj->title = '编辑矿区工作面';
+        $formObj->select('working_area', '矿区区域类型', SurfaceEnum::WORKING_AREA_LIST);
+        $formObj->input('surface_name', '矿区区域名称');
+        $formObj->title = '编辑矿区区域';
         return $this->from($formObj);
     }
 
     //编辑工作面操作
     public function surfaceEditPost(Request $request)
     {
-        if (!$request->input('mine_id') || !$request->input('surface_name')) {
+        if (!$request->input('mine_id') || !$request->input('surface_name') || !$request->input('working_area')) {
             return $this->error(1, '必填参数不能为空');
         }
 

+ 13 - 3
Modules/Mine/Services/SurfaceServices.php

@@ -18,6 +18,7 @@ use Modules\Camera\Enum\CameraEnum;
 use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\WorkingSurface;
 use Modules\Mine\Entities\WorkingSurfaceCamera;
+use Modules\Mine\Enum\SurfaceEnum;
 
 class SurfaceServices{
 
@@ -30,6 +31,7 @@ class SurfaceServices{
             [
                 'working_surface.id',
                 'working_surface.surface_name',
+                'working_surface.working_area',
                 'mine_list.title'
             ]
         )->get();
@@ -45,7 +47,8 @@ class SurfaceServices{
         )->where('working_surface.id', $surface_id)->select(
             [
                 'mine_list.title',
-                'working_surface.surface_name'
+                'working_surface.surface_name',
+                'working_surface.working_area',
             ]
         )->first();
 
@@ -62,6 +65,7 @@ class SurfaceServices{
             [
                 'mine_id'      => $params['mine_id'],
                 'surface_name' => $params['surface_name'],
+                'working_area' => $params['working_area'],
                 'created_at'   => date('Y-m-d H:i:s', time()),
                 'updated_at'   => date('Y-m-d H:i:s', time()),
             ]
@@ -94,6 +98,7 @@ class SurfaceServices{
             [
                 'mine_id'      => $params['mine_id'],
                 'surface_name' => $params['surface_name'],
+                'working_area' => $params['working_area'],
                 'updated_at'   => date('Y-m-d H:i:s', time()),
             ]
         );
@@ -158,7 +163,7 @@ class SurfaceServices{
     }
 
     //获取工作面列表
-    public static function getApiSurfaceList()
+    public static function getApiSurfaceList($working_area = SurfaceEnum::WORKING_AREA_WORK)
     {
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
@@ -171,7 +176,12 @@ class SurfaceServices{
         )->get()->toArray();
 
         foreach ($query as $key => $val) {
-            $surface = WorkingSurface::where('mine_id', $val['parent_id'])->orderBy('created_at', 'desc')->select(
+            $surface = WorkingSurface::where(
+                [
+                    'mine_id'      => $val['parent_id'],
+                    'working_area' => $working_area
+                ]
+            )->orderBy('created_at', 'desc')->select(
                 [
                     'id as surface_id',
                     'surface_name'