浏览代码

添加从硬盘录像机来源的摄像头读取封面图

qiuzijian 3 年之前
父节点
当前提交
dafebdd154
共有 2 个文件被更改,包括 10 次插入10 次删除
  1. 6 6
      .idea/workspace.xml
  2. 4 4
      Modules/Camera/Services/CameraServices.php

+ 6 - 6
.idea/workspace.xml

@@ -18,8 +18,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="548">
-              <caret line="460" column="163" selection-start-line="460" selection-start-column="163" selection-end-line="460" selection-end-column="163" />
+            <state relative-caret-position="226">
+              <caret line="443" column="78" selection-start-line="443" selection-start-column="78" selection-end-line="443" selection-end-column="78" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -422,12 +422,12 @@
       <workItem from="1641800375826" duration="26685000" />
       <workItem from="1643085370753" duration="22739000" />
       <workItem from="1644194909678" duration="1729000" />
-      <workItem from="1645500713676" duration="8044000" />
+      <workItem from="1645500713676" duration="8402000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="479145000" />
+    <option name="totallyTimeSpent" value="479503000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -805,8 +805,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="548">
-          <caret line="460" column="163" selection-start-line="460" selection-start-column="163" selection-end-line="460" selection-end-column="163" />
+        <state relative-caret-position="226">
+          <caret line="443" column="78" selection-start-line="443" selection-start-column="78" selection-end-line="443" selection-end-column="78" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>

+ 4 - 4
Modules/Camera/Services/CameraServices.php

@@ -441,7 +441,7 @@ class CameraServices
             //判断m3u8文件是否存在
             $file_exists = file_exists(public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/' . CameraEnum::M3U8_FILE_NAME);
             //判断ts文件是否存在
-            $ts_exists = glob(public_path() . '/' . CameraEnum::M3U8_FILE_PATH . '/' . $path . '/' . date('Ymd', time()) . '/' . CameraEnum::TS_FILE_SUFFIX);
+            $ts_exists = glob(public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/' . CameraEnum::TS_FILE_SUFFIX);
             //查询是否存在封面图
             $cover_picture = CameraList::where('id', $camera_id)->value('cover_picture');
 
@@ -450,15 +450,15 @@ class CameraServices
                 if (!$cover_picture) {
                     //获取第一帧作为封面图
                     $file_name = time() . CameraEnum::COVER_PICTURE_NAME;
-                    $cover_exec = 'ffmpeg -i ' . public_path() . '/' . CameraEnum::M3U8_FILE_PATH . '/' . $path . '/' . date('Ymd', time()) . '/' . CameraEnum::M3U8_FILE_NAME . ' -vf "select=between(mod(n\, 25)\, 0\, 0), setpts=N/24/TB" ' . public_path() . '/' . CameraEnum::M3U8_FILE_PATH . '/' . $path . '/' . date('Ymd', time()) . '/' . $file_name;
+                    $cover_exec = 'ffmpeg -i ' . public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/' . CameraEnum::M3U8_FILE_NAME . ' -vf "select=between(mod(n\, 25)\, 0\, 0), setpts=N/24/TB" ' . public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/' . $file_name;
                     exec($cover_exec);
 
                     //判断图片是否存在
-                    $picture_exists = file_exists(public_path() . '/' . CameraEnum::M3U8_FILE_PATH . '/' . $path . '/' . date('Ymd', time()) . '/' . $file_name);
+                    $picture_exists = file_exists(public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/' . $file_name);
 
                     if ($picture_exists) {
                         //上传图片到oss并更新数据库
-                        $picture_path = self::uploadOssFile($file_name, public_path() . '/' . CameraEnum::M3U8_FILE_PATH . '/' . $path . '/' . date('Ymd', time()) . '/');
+                        $picture_path = self::uploadOssFile($file_name, public_path() . '/' . CameraEnum::M3U8_FILE_PATH . $path . '/' . date('Ymd', time()) . '/');
                         CameraList::where('id', $camera_id)->update(['cover_picture' => $picture_path]);
                     }
                 }