修改更新视频脚本

.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
       <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,11 +19,10 @@
       <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="609">
-              <caret line="29" column="18" selection-end-line="31" selection-end-column="1" />
+            <state relative-caret-position="336">
+              <caret line="16" column="35" lean-forward="true" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
               <folding>
                 <element signature="e#6#91#0#PHP" expanded="true" />
-                <element signature="e#126#164#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -31,8 +31,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="62">
-              <caret line="577" column="31" selection-start-line="577" selection-start-column="31" selection-end-line="577" selection-end-column="31" />
+            <state relative-caret-position="213">
+              <caret line="520" column="64" selection-start-line="520" selection-start-column="56" selection-end-line="520" selection-end-column="64" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -88,8 +88,8 @@
       <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="550">
-              <caret line="118" column="41" selection-start-line="118" selection-start-column="41" selection-end-line="118" selection-end-column="41" />
+            <state relative-caret-position="-443">
+              <caret line="71" column="33" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
               <folding>
                 <element signature="e#40#71#0#PHP" expanded="true" />
               </folding>
@@ -112,8 +112,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="571">
-              <caret line="129" column="30" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="30" />
+            <state relative-caret-position="253">
+              <caret line="43" column="10" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -446,7 +446,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="464647000" />
+    <option name="totallyTimeSpent" value="465175000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -758,13 +758,6 @@
         </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="571">
-          <caret line="129" column="30" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="30" />
-        </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="420">
@@ -782,16 +775,6 @@
         </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="62">
-          <caret line="577" column="31" selection-start-line="577" selection-start-column="31" selection-end-line="577" selection-end-column="31" />
-          <folding>
-            <element signature="e#129#150#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/MineServices.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="508">
@@ -802,17 +785,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="609">
-          <caret line="29" column="18" selection-end-line="31" selection-end-column="1" />
-          <folding>
-            <element signature="e#6#91#0#PHP" expanded="true" />
-            <element signature="e#126#164#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Admin/Traits/ClassifyMethod.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="256">
@@ -830,10 +802,37 @@
         </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="253">
+          <caret line="43" column="10" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
+        </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="213">
+          <caret line="520" column="64" selection-start-line="520" selection-start-column="56" selection-end-line="520" selection-end-column="64" />
+          <folding>
+            <element signature="e#129#150#0#PHP" expanded="true" />
+          </folding>
+        </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="336">
+          <caret line="16" column="35" lean-forward="true" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
+          <folding>
+            <element signature="e#6#91#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="550">
-          <caret line="118" column="41" selection-start-line="118" selection-start-column="41" selection-end-line="118" selection-end-column="41" />
+        <state relative-caret-position="-443">
+          <caret line="71" column="33" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
           <folding>
             <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>

app/Console/Commands/UpdateHkList.php

@@ -66,14 +66,14 @@ class UpdateHkList extends Command
 
         foreach ($index_code_list as $key => $val) {
             $degree       = explode('|', $val->degree);
-            $trans_result = CameraServices::getHaiKangTransList($degree[0]);
+//            $trans_result = CameraServices::getHaiKangTransList($degree[0]);
             $result       = CameraServices::getHaiKangCamera($degree[0], $val->index_code, CameraEnum::CAMERA_TYPE_ALL);
 
-            if ($result['status'] && $trans_result['status']) {
+            if ($result['status'])) {
                 $trans_arr = [];
-                foreach ($trans_result['data'] as $tk => $tv) {
-                    $trans_arr[$tv['indexCode']]['ip'] = $tv['ip'];
-                }
+//                foreach ($trans_result['data'] as $tk => $tv) {
+//                    $trans_arr[$tv['indexCode']]['ip'] = $tv['ip'];
+//                }
 
                 $index_code_arr = [];
                 $arr_count = count($result['data']);
@@ -81,11 +81,11 @@ class UpdateHkList extends Command
                     $ip         = '';
                     $port       = '';
                     $com_number = '';
-                    if (isset($trans_arr[$v['trans_code']])) {
-                        $ip         = $trans_arr[$v['trans_code']]['ip'];
-                        $port       = CameraEnum::HAK_DEFAULT_PORT;
-                        $com_number = $v['com_number'];
-                    }
+//                    if (isset($trans_arr[$v['trans_code']])) {
+//                        $ip         = $trans_arr[$v['trans_code']]['ip'];
+//                        $port       = CameraEnum::HAK_DEFAULT_PORT;
+//                        $com_number = $v['com_number'];
+//                    }
 
                     //当前摄像头index_code数组
                     $index_code_arr[$k] = $v['camera_id'];

app/Http/Controllers/TestsController.php

@@ -26,7 +26,7 @@ class TestsController {
 
     public function test()
     {
-        $result = MineServices::getHaiKangArea(8, CameraEnum::REQUEST_TYPE_LOCAL);
+        $result = CameraServices::getHaiKangCamera('9', 'bf2b72bf-25f4-4655-92c2-23dd40e05657', CameraEnum::CAMERA_TYPE_ALL);
         dd($result);
     }
 }