Quellcode durchsuchen

修改接口判断摄像头取流地址

qiuzijian vor 4 Jahren
Ursprung
Commit
857ae75be8

+ 5 - 5
.idea/workspace.xml

@@ -18,8 +18,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
-              <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+            <state relative-caret-position="389">
+              <caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
               <folding>
                 <element signature="e#141#162#0#PHP" expanded="true" />
               </folding>
@@ -440,7 +440,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="315192000" />
+    <option name="totallyTimeSpent" value="315291000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -844,8 +844,8 @@
     </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="368">
-          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+        <state relative-caret-position="389">
+          <caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
           <folding>
             <element signature="e#141#162#0#PHP" expanded="true" />
           </folding>

+ 2 - 2
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -69,9 +69,9 @@ class CameraApiController extends BaseController
         $is_hak = MineListExt::where('mine_id', $parent_id)->value('is_hak');
 
         //判断是否生成摄像头请求链接
-        $camera = CameraList::where('id', $camera_id)->value('camera_url');
+        $camera_url = CameraList::where('id', $camera_id)->value('camera_url');
 
-        if ($is_hak && !$camera) {
+        if ($is_hak && !$camera_url) {
             $result = CameraServices::downloadCameraFiles($parent_id, $camera_id);
         } else {
             $result = CameraServices::getCameraUrlByCameraId($camera_id);