修改脚本

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <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/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -52,8 +51,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="111">
-              <caret line="391" column="73" selection-start-line="391" selection-start-column="73" selection-end-line="391" selection-end-column="73" />
+            <state relative-caret-position="442">
+              <caret line="421" column="85" selection-start-line="421" selection-start-column="85" selection-end-line="421" selection-end-column="85" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -485,7 +484,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="259147000" />
+    <option name="totallyTimeSpent" value="259986000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -865,8 +864,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="391" column="73" selection-start-line="391" selection-start-column="73" selection-end-line="391" selection-end-column="73" />
+        <state relative-caret-position="442">
+          <caret line="421" column="85" selection-start-line="421" selection-start-column="85" selection-end-line="421" selection-end-column="85" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

Modules/Camera/Services/CameraServices.php

@@ -386,13 +386,8 @@ class CameraServices
 
         $curl_res = json_decode($curl_res, true);
 
+        $success = 0;
         if ($curl_res['total'] > 0) {
-            CameraList::whereNotIn('revert_id', $curl_res['rows'])->update(
-                [
-                    'revert_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
-                ]
-            );
-
             //根据返回id调停止推流接口
             foreach ($curl_res['rows'] as $key => $val) {
                 $data = [
@@ -414,6 +409,7 @@ class CameraServices
                             'updated_at' => date('Y-m-d H:i:s'),
                         ]
                     );
+                    $success++;
                 } else {
                     Log::info('流媒体服务器停止推流失败id:' . $val['id']);
                     Log::info('流媒体服务器停止推流失败返回结果');
@@ -422,6 +418,15 @@ class CameraServices
             }
         }
 
+        if ($success == $curl_res['total']) {
+            CameraList::where('revert_id', '!=', CameraEnum::CAMERA_DEFAULT_REVERT_ID)->update(
+                [
+                    'revert_id'  => CameraEnum::CAMERA_DEFAULT_REVERT_ID,
+                    'updated_at' => date('Y-m-d H:i:s'),
+                ]
+            );
+        }
+
         //清空海康视频服务器已存在id
         CameraList::where('revert_id', CameraEnum::CAMERA_FILE_EXIST)->update(['revert_id' => CameraEnum::CAMERA_DEFAULT_REVERT_ID]);