修改同步摄像头脚本

.idea/workspace.xml

@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.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/Enum/CameraEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.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$/app/Console/Commands/UpdateHkList.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,74 +23,74 @@
       <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="232">
-              <caret line="37" column="25" selection-start-line="37" selection-start-column="10" selection-end-line="37" selection-end-column="25" />
+            <state relative-caret-position="613">
+              <caret line="71" column="26" selection-start-line="71" selection-start-column="10" selection-end-line="71" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.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="556">
-              <caret line="138" column="52" selection-start-line="138" selection-start-column="52" selection-end-line="138" selection-end-column="52" />
+            <state relative-caret-position="421">
+              <caret line="106" column="41" selection-start-line="106" selection-start-column="41" selection-end-line="106" selection-end-column="41" />
               <folding>
-                <element signature="e#51#107#0#PHP" expanded="true" />
+                <element signature="e#141#162#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
+      <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="481">
-              <caret line="196" column="64" selection-start-line="196" selection-start-column="64" selection-end-line="196" selection-end-column="64" />
+            <state relative-caret-position="126">
+              <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
       <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/Mine/Http/Controllers/Api/MineApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="106">
+              <caret line="47" column="38" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="38" />
               <folding>
-                <element signature="e#141#162#0#PHP" expanded="true" />
+                <element signature="e#139#160#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/Api/MineApiController.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="657">
+              <caret line="501" column="39" selection-start-line="501" selection-start-column="29" selection-end-line="501" selection-end-column="39" />
               <folding>
-                <element signature="e#139#160#0#PHP" expanded="true" />
+                <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state relative-caret-position="676">
+              <caret line="88" column="22" lean-forward="true" selection-start-line="79" selection-start-column="19" selection-end-line="88" selection-end-column="22" />
               <folding>
-                <element signature="e#135#163#0#PHP" expanded="true" />
+                <element signature="e#40#71#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
+        <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="537">
-              <caret line="189" lean-forward="true" selection-start-line="189" selection-end-line="189" />
+            <state relative-caret-position="437">
+              <caret line="270" column="37" selection-start-line="270" selection-start-column="29" selection-end-line="270" selection-end-column="37" />
               <folding>
                 <element signature="e#127#148#0#PHP" expanded="true" />
               </folding>
@@ -93,13 +98,34 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="227">
+              <caret line="264" column="23" lean-forward="true" selection-start-line="261" selection-start-column="6" selection-end-line="264" selection-end-column="23" />
+              <folding>
+                <element signature="e#141#185#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="538">
+              <caret line="44" column="46" lean-forward="true" selection-start-line="35" selection-start-column="8" selection-end-line="44" selection-end-column="46" />
+              <folding>
+                <element signature="e#126#164#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>QUEUE_CONNECTION</find>
-      <find>Predis\Client</find>
-      <find>REDIS_QUEUE</find>
       <find>getlist</find>
       <find>//todo</find>
       <find>// todo</find>
@@ -127,6 +153,9 @@
       <find>public</find>
       <find>$file_exists</find>
       <find>all()</find>
+      <find>cameras/indexCode</find>
+      <find>subResources</find>
+      <find>getTranscodeList</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -160,24 +189,19 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
         <option value="$PROJECT_DIR$/Modules/Mine/Entities/MineList.php" />
         <option value="$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.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$/.env" />
         <option value="$PROJECT_DIR$/app/Enum/ApiEnum.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/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$/app/Http/Controllers/TestsController.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" />
@@ -186,6 +210,11 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.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/Camera/Http/Controllers/Api/HaiKangController.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
+        <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
       </list>
     </option>
   </component>
@@ -470,7 +499,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="302555000" />
+    <option name="totallyTimeSpent" value="312782000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -629,26 +658,6 @@
     <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="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#40#71#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.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" />
-          <folding>
-            <element signature="e#141#185#0#PHP" expanded="true" />
-          </folding>
-        </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">
@@ -722,16 +731,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="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>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="613">
@@ -746,16 +745,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.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>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/composer.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -763,13 +752,6 @@
         </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/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">
@@ -784,98 +766,145 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/SurfaceEnum.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.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 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>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.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 relative-caret-position="314">
+          <caret line="52" column="27" selection-start-line="52" selection-start-column="27" selection-end-line="52" selection-end-column="27" />
+          <folding>
+            <element signature="e#135#163#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
+    <entry file="file://$PROJECT_DIR$/Modules/Mine/Enum/SurfaceEnum.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 relative-caret-position="84">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
         </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="537">
-          <caret line="189" lean-forward="true" selection-start-line="189" selection-end-line="189" />
+        <state relative-caret-position="2804">
+          <caret line="168" column="52" selection-start-line="168" selection-start-column="52" selection-end-line="168" selection-end-column="52" />
           <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">
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="481">
+          <caret line="196" column="64" selection-start-line="196" selection-start-column="64" selection-end-line="196" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2230">
+          <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#135#163#0#PHP" expanded="true" />
+            <element signature="e#51#107#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/Routes/api.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="420">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.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="610">
-          <caret line="47" column="51" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
+        <state relative-caret-position="106">
+          <caret line="47" column="38" selection-start-line="47" selection-start-column="38" selection-end-line="47" selection-end-column="38" />
           <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/Routes/api.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="15" column="31" lean-forward="true" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="31" />
+        </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="31">
-          <caret line="266" column="126" selection-start-line="266" selection-start-column="115" selection-end-line="266" selection-end-column="126" />
+        <state relative-caret-position="437">
+          <caret line="270" column="37" selection-start-line="270" selection-start-column="29" selection-end-line="270" selection-end-column="37" />
           <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
+            <element signature="e#127#148#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$/app/Http/Controllers/TestsController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="538">
+          <caret line="44" column="46" lean-forward="true" selection-start-line="35" selection-start-column="8" selection-end-line="44" selection-end-column="46" />
           <folding>
-            <element signature="e#139#160#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$/Modules/Camera/Http/Controllers/Api/HaiKangController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="227">
+          <caret line="264" column="23" lean-forward="true" selection-start-line="261" selection-start-column="6" selection-end-line="264" selection-end-column="23" />
           <folding>
-            <element signature="e#51#107#0#PHP" expanded="true" />
+            <element signature="e#141#185#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.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="481">
-          <caret line="196" column="64" selection-start-line="196" selection-start-column="64" selection-end-line="196" selection-end-column="64" />
+        <state relative-caret-position="421">
+          <caret line="106" column="41" selection-start-line="106" selection-start-column="41" selection-end-line="106" selection-end-column="41" />
+          <folding>
+            <element signature="e#141#162#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="613">
+          <caret line="71" column="26" selection-start-line="71" selection-start-column="10" selection-end-line="71" selection-end-column="26" />
+        </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="657">
+          <caret line="501" column="39" selection-start-line="501" selection-start-column="29" selection-end-line="501" selection-end-column="39" />
+          <folding>
+            <element signature="e#129#150#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="676">
+          <caret line="88" column="22" lean-forward="true" selection-start-line="79" selection-start-column="19" selection-end-line="88" selection-end-column="22" />
+          <folding>
+            <element signature="e#40#71#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

Modules/Camera/Enum/CameraEnum.php

@@ -67,4 +67,7 @@ class CameraEnum
 
     //乐橙接口返回状态
     const LECHANGE_API_SUCCESS = 0;  //成功
+
+    //海康摄像头默认端口
+    const HAK_DEFAULT_PORT = '554';
 }

Modules/Camera/Http/Controllers/Api/HaiKangController.php

@@ -60,7 +60,7 @@ class HaiKangController extends BaseController
     {
         $url = $this->artemis . '/api/resource/v1/regions';
         //请求参数
-        $params             = [];
+        $params = [];
 //        $params['pageNo']   = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
 //        $params['pageSize'] = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
         $params['pageNo']   = 1;
@@ -137,8 +137,8 @@ class HaiKangController extends BaseController
                 $arr[$key]['parentIndexCode'] = $value['parentIndexCode'];
                 $arr[$key]['treeCode']        = $value['treeCode'];
 
-                $id     = MineList::where('index_code', $value['indexCode'])->value('id');
-                $params = [
+                $id      = MineList::where('index_code', $value['indexCode'])->value('id');
+                $params  = [
                     'id'         => $id,
                     'parent_id'  => $parent_id,
                     'title'      => $value['name'],
@@ -173,9 +173,9 @@ class HaiKangController extends BaseController
         $params['regionIndexCode'] = Input::get('indexCode');
 //        $params['pageNo']          = $request->has('pageNo') ? intval($request->input('pageNo')) : 1;
 //        $params['pageSize']        = $request->has('pageSize') ? intval($request->input('pageSize')) : 1000;
-        $params['pageNo']          = 1;
-        $params['pageSize']        = 1000;
-        $this->sign                = $this->get_sign($url);
+        $params['pageNo']   = 1;
+        $params['pageSize'] = 1000;
+        $this->sign         = $this->get_sign($url);
 
         $result = $this->curlPost($this->pre_url . $url, json_encode($params));
         $result = json_decode($result, true);
@@ -191,7 +191,7 @@ class HaiKangController extends BaseController
         if (!Input::has('cameraIndexCode')) {
             return $this->error(1, '缺少必要参数');
         }
-        $protocol = Input::get('protocol', 'hls');
+        $protocol     = Input::get('protocol', 'hls');
         $url          = $this->artemis . '/api/video/v1/cameras/previewURLs';
         $cameras_info = json_decode($this->getCamerasInfo(Input::all()), true);
         //请求参数
@@ -250,6 +250,21 @@ class HaiKangController extends BaseController
         return $result;
     }
 
+    //获取编码设备列表
+    public function getTranscodeList()
+    {
+        $url = $this->artemis . '/api/resource/v1/encodeDevice/subResources';
+        //请求参数
+        $params['regionIndexCode'] = 'root000000';
+        $params['pageNo']          = 1;
+        $params['pageSize']        = 100;
+
+        $this->sign = $this->get_sign($url);
+        $result     = $this->curlPost($this->pre_url . $url, json_encode($params));
+        $result     = json_decode($result, true);
+        return $result;
+    }
+
     /**
      * 以appSecret为密钥，使用HmacSHA256算法对签名字符串生成消息摘要，对消息摘要使用BASE64算法生成签名（签名过程中的编码方式全为UTF-8）
      */

Modules/Camera/Services/CameraServices.php

@@ -498,6 +498,8 @@ class CameraServices
                 $list[$key]['mine_id']     = $mine_id;
                 $list[$key]['camera_id']   = $val['cameraIndexCode'];
                 $list[$key]['camera_name'] = $val['cameraName'];
+                $list[$key]['trans_code']  = $val['encodeDevIndexCode'];
+                $list[$key]['com_number']  = $val['channelNo'];
             }
         }
 
@@ -506,6 +508,33 @@ class CameraServices
         return $result;
     }
 
+    //查询海康摄像头编码设备列表
+    public static function getHaiKangTransList($parent_id)
+    {
+        $result['status'] = true;
+        $result['msg']    = ApiEnum::RETURN_SUCCESS;
+        $result['data']   = [];
+
+        $query = MineListExt::where('mine_id', $parent_id)->first();
+
+        //先获取编码设备列表
+        Input::replace(
+            [
+                'url'    => trim($query->ip, '/') . ':' . $query->port,
+                'key'    => $query->key,
+                'secret' => $query->secret,
+            ]
+        );
+        $haikang   = new HaiKangController();
+        $result_hk = $haikang->getTranscodeList();
+
+        if ($result_hk['data']['list']) {
+            $result['data'] = $result_hk['data']['list'];
+        }
+
+        return $result;
+    }
+
     //查询海康矿井摄像头播放链接
     public static function getHaiKangCameraUrl($parent_id, $camera_id)
     {

app/Console/Commands/UpdateHkList.php

@@ -60,21 +60,32 @@ class UpdateHkList extends Command
 
     public function updateCameraList()
     {
+
         //查询存在index_code列表
         $index_code_list = MineList::where('index_code', '!=', null)->get();
 
         foreach ($index_code_list as $key => $val) {
-            $degree = explode('|', $val->degree);
-            $result = CameraServices::getHaiKangCamera($degree[0], $val->index_code, CameraEnum::CAMERA_TYPE_ALL);
+            $degree       = explode('|', $val->degree);
+            $trans_result = CameraServices::getHaiKangTransList($degree[0]);
+            $result       = CameraServices::getHaiKangCamera($degree[0], $val->index_code, CameraEnum::CAMERA_TYPE_ALL);
+
+            if ($result['status'] && $trans_result['status']) {
+                $trans_arr = [];
+                foreach ($trans_result['data'] as $tk => $tv) {
+                    $trans_arr[$tv['indexCode']]['ip'] = $tv['ip'];
+                }
 
-            if ($result['status']) {
                 foreach ($result['data'] as $k => $v) {
+                    $camera_ip = $trans_arr[$v['trans_code']]['ip'];
                     $params = [
                         'mine_id'       => $val->id,
                         'camera_name'   => $v['camera_name'],
                         'index_code'    => $v['camera_id'],
                         'revert_id'     => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
                         'camera_source' => CameraEnum::CAMERA_SOURCE_2,
+                        'ip'            => $camera_ip,
+                        'port'          => CameraEnum::HAK_DEFAULT_PORT,
+                        'com_number'    => $v['com_number'],
                     ];
                     CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
                 }