修改接口自动切换码流功能

.idea/workspace.xml

@@ -2,6 +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$/Modules/Camera/Enum/CameraEnum.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -42,8 +43,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="831" column="77" selection-start-line="831" selection-start-column="77" selection-end-line="831" selection-end-column="77" />
+            <state relative-caret-position="433">
+              <caret line="872" column="16" selection-start-line="872" selection-start-column="16" selection-end-line="872" selection-end-column="16" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -76,18 +77,6 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="319">
-              <caret line="84" column="23" lean-forward="true" selection-start-line="84" selection-start-column="23" selection-end-line="84" selection-end-column="23" />
-              <folding>
-                <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$/app/Console/Commands/StopStreamDelFiles.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="571">
@@ -102,8 +91,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="274">
-              <caret line="104" column="26" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="26" />
+            <state relative-caret-position="634">
+              <caret line="131" column="29" selection-start-line="131" selection-start-column="10" selection-end-line="131" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -196,10 +185,10 @@
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2022_01_21_151316_add_field_to_camera_list_2021_01_21.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
         <option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
         <option value="$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
       </list>
     </option>
@@ -437,12 +426,12 @@
       <workItem from="1641785500605" duration="61000" />
       <workItem from="1641786030534" duration="477000" />
       <workItem from="1641800375826" duration="26685000" />
-      <workItem from="1643085370753" duration="18527000" />
+      <workItem from="1643085370753" duration="18814000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="448578000" />
+    <option name="totallyTimeSpent" value="448865000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -788,16 +777,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="84" column="23" lean-forward="true" selection-start-line="84" selection-start-column="23" selection-end-line="84" selection-end-column="23" />
-          <folding>
-            <element signature="e#40#71#0#PHP" expanded="true" />
-          </folding>
-        </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="487">
@@ -818,17 +797,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/Console/Commands/UpdateCameraStatus.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="69" column="50" selection-start-line="69" selection-start-column="50" selection-end-line="69" selection-end-column="50" />
+          <folding>
+            <element signature="e#40#71#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="274">
-          <caret line="104" column="26" selection-start-line="104" selection-start-column="10" selection-end-line="104" selection-end-column="26" />
+        <state relative-caret-position="634">
+          <caret line="131" column="29" selection-start-line="131" selection-start-column="10" selection-end-line="131" selection-end-column="29" />
         </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="248">
-          <caret line="831" column="77" selection-start-line="831" selection-start-column="77" selection-end-line="831" selection-end-column="77" />
+        <state relative-caret-position="433">
+          <caret line="872" column="16" selection-start-line="872" selection-start-column="16" selection-end-line="872" selection-end-column="16" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

Modules/Camera/Enum/CameraEnum.php

@@ -129,4 +129,5 @@ class CameraEnum
     //摄像头状态
     const CAMERA_STATUS_ONLINE  = '1';  //在线
     const CAMERA_STATUS_OFFLINE = '2';  //离线
+    const CAMERA_STATUS_ERROR   = '3';  //异常
 }

Modules/Camera/Services/CameraServices.php

@@ -816,6 +816,9 @@ class CameraServices
                 $result_hk_2 = $haikang->getCamerasUrl();
 
                 if (!$result_hk_2['data']['url']) {
+                    //标记摄像头为异常状态
+                    CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
+
                     $result['status'] = false;
                     $result['msg'] = ApiEnum::HK_REQUEST_FAIL;
                     return $result;
@@ -824,6 +827,9 @@ class CameraServices
                 $res = self::getVideoStream($result_hk_2, $path, $camera_id);
 
                 if (!$res) {
+                    //标记摄像头为异常状态
+                    CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
+
                     $result['status'] = false;
                     $result['msg'] = ApiEnum::HK_REQUEST_FAIL;
                     return $result;
@@ -851,6 +857,9 @@ class CameraServices
             $result_hk_2 = $haikang->getCamerasUrl();
 
             if (!$result_hk_2['data']['url']) {
+                //标记摄像头为异常状态
+                CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
+
                 $result['status'] = false;
                 $result['msg'] = ApiEnum::HK_REQUEST_FAIL;
                 return $result;
@@ -859,6 +868,9 @@ class CameraServices
             $res = self::getVideoStream($result_hk_2, $path, $camera_id);
 
             if (!$res) {
+                //标记摄像头为异常状态
+                CameraList::where('id', $camera_id)->update(['camera_status' => CameraEnum::CAMERA_STATUS_ERROR]);
+                
                 $result['status'] = false;
                 $result['msg'] = ApiEnum::HK_REQUEST_FAIL;
                 return $result;