Browse Source

工作面接口

qiuzijian 4 years ago
parent
commit
ae920e2901

+ 92 - 96
.idea/workspace.xml

@@ -2,7 +2,13 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.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/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/api.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>
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,8 +24,8 @@
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
           <provider selected="true" editor-type-id="text-editor">
           <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 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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -27,8 +33,8 @@
       <file pinned="false" current-in-tab="false">
       <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/Http/Controllers/Api/CameraApiController.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="409">
-              <caret line="68" column="46" lean-forward="true" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
+            <state relative-caret-position="522">
+              <caret line="47" column="51" lean-forward="true" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
               <folding>
               <folding>
                 <element signature="e#141#162#0#PHP" expanded="true" />
                 <element signature="e#141#162#0#PHP" expanded="true" />
               </folding>
               </folding>
@@ -36,11 +42,32 @@
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <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>
+      </file>
+      <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="1323">
+              <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
+              <folding>
+                <element signature="e#139#160#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="true">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="523">
-              <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
+            <state relative-caret-position="156">
+              <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
               <folding>
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
               </folding>
@@ -49,12 +76,12 @@
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
           <provider selected="true" editor-type-id="text-editor">
           <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" />
+            <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" />
               <folding>
               <folding>
-                <element signature="e#126#164#0#PHP" expanded="true" />
+                <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
@@ -64,7 +91,6 @@
   </component>
   </component>
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
-      <find>Module</find>
       <find>QUEUE_CONNECTION</find>
       <find>QUEUE_CONNECTION</find>
       <find>Predis\Client</find>
       <find>Predis\Client</find>
       <find>REDIS_QUEUE</find>
       <find>REDIS_QUEUE</find>
@@ -94,6 +120,7 @@
       <find>menu</find>
       <find>menu</find>
       <find>public</find>
       <find>public</find>
       <find>$file_exists</find>
       <find>$file_exists</find>
+      <find>all()</find>
     </findStrings>
     </findStrings>
   </component>
   </component>
   <component name="Git.Settings">
   <component name="Git.Settings">
@@ -110,7 +137,6 @@
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.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/Database/Migrations/2021_04_26_024115_add_sort_to_camera_list_table.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
         <option value="$PROJECT_DIR$/app/Helpers.php" />
         <option value="$PROJECT_DIR$/app/Helpers.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.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/Database/Migrations/2021_04_28_111556_create_mine_list_ext_table.php" />
@@ -133,12 +159,9 @@
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
         <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/.env" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
         <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
         <option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.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/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/Mine/Entities/WorkingSurface.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/Http/Controllers/MineController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
@@ -149,10 +172,14 @@
         <option value="$PROJECT_DIR$/Modules/Mine/Routes/web.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/CameraController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
-        <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.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/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
+        <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -368,38 +395,14 @@
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" 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="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="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" />
+              <item name="Camera" type="462c0819:PsiDirectoryNode" />
+              <item name="Routes" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Modules" type="462c0819:PsiDirectoryNode" />
               <item name="Mine" type="462c0819:PsiDirectoryNode" />
               <item name="Mine" type="462c0819:PsiDirectoryNode" />
-              <item name="Http" type="462c0819:PsiDirectoryNode" />
-              <item name="Controllers" type="462c0819:PsiDirectoryNode" />
-              <item name="Api" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
@@ -411,13 +414,6 @@
             <path>
             <path>
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <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" />
               <item name="routes" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
           </expand>
           </expand>
@@ -470,7 +466,7 @@
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="291210000" />
+    <option name="totallyTimeSpent" value="296016000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -619,13 +615,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php">
     <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
         <state relative-caret-position="210">
@@ -643,13 +632,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="17" column="76" selection-start-line="17" selection-start-column="76" selection-end-line="17" selection-end-column="76" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/Helpers.php">
     <entry file="file://$PROJECT_DIR$/app/Helpers.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="950">
         <state relative-caret-position="950">
@@ -708,16 +690,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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="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#139#160#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
         <state relative-caret-position="260">
@@ -787,16 +759,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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/Admin/Routes/web.php">
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="613">
         <state relative-caret-position="613">
@@ -838,37 +800,71 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
+    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="613">
+        <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>
+        </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="483">
+          <caret line="23" column="32" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <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/Http/Controllers/Api/MineApiController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1323">
           <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
           <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
+          <folding>
+            <element signature="e#139#160#0#PHP" expanded="true" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="409">
-          <caret line="68" column="46" lean-forward="true" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
+        <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" />
           <folding>
           <folding>
-            <element signature="e#141#162#0#PHP" expanded="true" />
+            <element signature="e#127#148#0#PHP" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
       <provider selected="true" editor-type-id="text-editor">
       <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" />
+        <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>
+      </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="522">
+          <caret line="47" column="51" lean-forward="true" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
           <folding>
           <folding>
-            <element signature="e#126#164#0#PHP" expanded="true" />
+            <element signature="e#141#162#0#PHP" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="523">
-          <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
+        <state relative-caret-position="156">
+          <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
           <folding>
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
           </folding>

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

@@ -29,18 +29,23 @@ class CameraApiController extends BaseController
         $parent_id   = Input::get('parent_id', '');
         $parent_id   = Input::get('parent_id', '');
         $mine_id     = Input::get('mine_id', '');
         $mine_id     = Input::get('mine_id', '');
         $camera_type = Input::get('camera_type', CameraEnum::CAMERA_TYPE_ALL);
         $camera_type = Input::get('camera_type', CameraEnum::CAMERA_TYPE_ALL);
+        $surface_id  = Input::get('surface_id', '');
 
 
         if (!$parent_id) {
         if (!$parent_id) {
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
         }
 
 
+        if ($camera_type == CameraEnum::CAMERA_TYPE_WORK && !$surface_id) {
+            return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
+        }
+
         //判断是否使用海康视频服务器
         //判断是否使用海康视频服务器
 //        $is_hak = MineListExt::where('mine_id', $parent_id)->value('is_hak');
 //        $is_hak = MineListExt::where('mine_id', $parent_id)->value('is_hak');
 
 
 //        if ($is_hak) {
 //        if ($is_hak) {
 //            $result = CameraServices::getHaiKangCamera($parent_id, $mine_id, $camera_type);
 //            $result = CameraServices::getHaiKangCamera($parent_id, $mine_id, $camera_type);
 //        } else {
 //        } else {
-            $result = CameraServices::getCameraListByMineId($mine_id, $camera_type, $parent_id);
+            $result = CameraServices::getCameraListByMineId($mine_id, $camera_type, $parent_id, $surface_id);
 //        }
 //        }
 
 
         return self::successResponse($result);
         return self::successResponse($result);

+ 1 - 0
Modules/Camera/Routes/api.php

@@ -18,6 +18,7 @@ Route::namespace('Api')->group(function () {
     Route::post('camera/transcode', 'CameraApiController@getTranscodeInfo');
     Route::post('camera/transcode', 'CameraApiController@getTranscodeInfo');
     Route::get('camera/stopstream', 'CameraApiController@stopCamerasStream');
     Route::get('camera/stopstream', 'CameraApiController@stopCamerasStream');
     Route::post('camera/lake/getlist', 'CameraApiController@getSouthLakeCamera');
     Route::post('camera/lake/getlist', 'CameraApiController@getSouthLakeCamera');
+    Route::post('camera/surface/getlist', 'CameraApiController@getWorkSurfaceCamera');
 
 
     //海康视频接口
     //海康视频接口
     Route::get('haikang/monitor/regions/list', 'HaiKangController@getRegionsList');
     Route::get('haikang/monitor/regions/list', 'HaiKangController@getRegionsList');

+ 10 - 1
Modules/Camera/Services/CameraServices.php

@@ -19,6 +19,7 @@ use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Http\Controllers\Api\HaiKangController;
 use Modules\Camera\Http\Controllers\Api\HaiKangController;
 use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Entities\MineListExt;
+use Modules\Mine\Entities\WorkingSurfaceCamera;
 use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Services\MineServices;
 use Modules\Mine\Services\MineServices;
 
 
@@ -263,7 +264,7 @@ class CameraServices
     }
     }
 
 
     //根据矿区id获取摄像头列表
     //根据矿区id获取摄像头列表
-    public static function getCameraListByMineId($mine_id, $camera_type = CameraEnum::CAMERA_TYPE_ALL, $parent_id)
+    public static function getCameraListByMineId($mine_id, $camera_type = CameraEnum::CAMERA_TYPE_ALL, $parent_id, $surface_id = '')
     {
     {
         $result['status'] = true;
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
@@ -282,8 +283,16 @@ class CameraServices
             ]
             ]
         )->get()->toArray();
         )->get()->toArray();
 
 
+        $surface_camera = [];
+        if ($surface_id) {
+            $surface_camera = WorkingSurfaceCamera::where('surface_id', $surface_id)->pluck('camera_id')->all();
+        }
+
         $arr = [];
         $arr = [];
         foreach ($query as $key => $val) {
         foreach ($query as $key => $val) {
+            if ($surface_id && !in_array($val['camera_id'], $surface_camera)) {
+                continue;
+            }
             $val['parent_id'] = $parent_id;
             $val['parent_id'] = $parent_id;
             if ($camera_type && !in_array($camera_type, [CameraEnum::CAMERA_TYPE_ALL, CameraEnum::CAMERA_TYPE_NORMAL])) {
             if ($camera_type && !in_array($camera_type, [CameraEnum::CAMERA_TYPE_ALL, CameraEnum::CAMERA_TYPE_NORMAL])) {
                 $degree = MineList::where('id', $val['mine_id'])->value('degree');
                 $degree = MineList::where('id', $val['mine_id'])->value('degree');

+ 13 - 0
Modules/Mine/Http/Controllers/Api/MineApiController.php

@@ -16,6 +16,7 @@ use Modules\Camera\Http\Controllers\Api\HaiKangController;
 use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Entities\MineListExt;
 use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Enum\MineEnum;
 use Modules\Mine\Services\MineServices;
 use Modules\Mine\Services\MineServices;
+use Modules\Mine\Services\SurfaceServices;
 
 
 class MineApiController extends BaseController
 class MineApiController extends BaseController
 {
 {
@@ -57,4 +58,16 @@ class MineApiController extends BaseController
 
 
         return self::successResponse($result);
         return self::successResponse($result);
     }
     }
+
+    /**
+     * 作者: qiuzijian
+     * 注释: 获取工作面列表
+     * @return \App\Http\Controllers\Api\JsonResponse
+     */
+    public function getSurfaceList()
+    {
+        $result = SurfaceServices::getApiSurfaceList();
+
+        return self::successResponse($result);
+    }
 }
 }

+ 6 - 0
Modules/Mine/Routes/api.php

@@ -14,6 +14,12 @@ use Illuminate\Http\Request;
 */
 */
 
 
 Route::namespace('Api')->group(function () {
 Route::namespace('Api')->group(function () {
+    //查询矿区列表
     Route::get('mine/getmine', 'MineApiController@getMineList');
     Route::get('mine/getmine', 'MineApiController@getMineList');
+
+    //查询区域列表
     Route::get('mine/getlist', 'MineApiController@getAreaList');
     Route::get('mine/getlist', 'MineApiController@getAreaList');
+
+    //查询工作面列表
+    Route::post('surface/getlist', 'MineApiController@getSurfaceList');
 });
 });

+ 30 - 0
Modules/Mine/Services/SurfaceServices.php

@@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 use Modules\Admin\Enum\AdminEnum;
 use Modules\Admin\Enum\AdminEnum;
 use Modules\Camera\Enum\CameraEnum;
 use Modules\Camera\Enum\CameraEnum;
+use Modules\Mine\Entities\MineList;
 use Modules\Mine\Entities\WorkingSurface;
 use Modules\Mine\Entities\WorkingSurface;
 use Modules\Mine\Entities\WorkingSurfaceCamera;
 use Modules\Mine\Entities\WorkingSurfaceCamera;
 
 
@@ -155,4 +156,33 @@ class SurfaceServices{
             );
             );
         }
         }
     }
     }
+
+    //获取工作面列表
+    public static function getApiSurfaceList()
+    {
+        $result['status'] = true;
+        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+
+        $query = MineList::where('parent_id', 0)->select(
+            [
+                'id as parent_id',
+                'title as mine_name',
+            ]
+        )->get()->toArray();
+
+        foreach ($query as $key => $val) {
+            $surface = WorkingSurface::where('mine_id', $val['parent_id'])->orderBy('created_at', 'desc')->select(
+                [
+                    'id as surface_id',
+                    'surface_name'
+                ]
+            )->get()->toArray();
+
+            $query[$key]['surface_list'] = $surface;
+        }
+
+        $result['data'] = $query;
+
+        return $result;
+    }
 }
 }