修改同步海康视频脚本

.idea/workspace.xml

@@ -2,12 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <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/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" />
@@ -77,8 +72,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="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" />
+            <state relative-caret-position="701">
+              <caret line="95" column="54" selection-start-line="95" selection-start-column="54" selection-end-line="95" selection-end-column="54" />
               <folding>
                 <element signature="e#40#71#0#PHP" expanded="true" />
               </folding>
@@ -113,8 +108,8 @@
       <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" />
+            <state relative-caret-position="160">
+              <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
               <folding>
                 <element signature="e#126#164#0#PHP" expanded="true" />
               </folding>
@@ -499,7 +494,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="312782000" />
+    <option name="totallyTimeSpent" value="313198000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -853,8 +848,8 @@
     </entry>
     <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" />
+        <state relative-caret-position="160">
+          <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding>
             <element signature="e#126#164#0#PHP" expanded="true" />
           </folding>
@@ -900,8 +895,8 @@
     </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" />
+        <state relative-caret-position="701">
+          <caret line="95" column="54" selection-start-line="95" selection-start-column="54" selection-end-line="95" selection-end-column="54" />
           <folding>
             <element signature="e#40#71#0#PHP" expanded="true" />
           </folding>

app/Console/Commands/UpdateHkList.php

@@ -76,16 +76,24 @@ class UpdateHkList extends Command
                 }
 
                 foreach ($result['data'] as $k => $v) {
-                    $camera_ip = $trans_arr[$v['trans_code']]['ip'];
+                    $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'];
+                    }
+
                     $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'],
+                        'ip'            => $ip,
+                        'port'          => $port,
+                        'com_number'    => $com_number,
                     ];
                     CameraList::updateOrCreate(['index_code' => $v['camera_id']], $params);
                 }