添加上传封面图功能

.gitignore

@@ -11,3 +11,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /public/files
+/public/filedownload

.idea/workspace.xml

@@ -2,6 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/public/filedownload/test.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.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>
@@ -28,8 +32,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="254">
-              <caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
+            <state relative-caret-position="529">
+              <caret line="455" column="40" selection-start-line="455" selection-start-column="40" selection-end-line="455" selection-end-column="40" />
               <folding>
                 <element signature="e#51#107#0#PHP" expanded="true" />
               </folding>
@@ -57,13 +61,15 @@
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log">
-          <provider selected="true" editor-type-id="text-editor" />
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-840" />
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
+            <state relative-caret-position="287">
               <caret line="226" column="20" selection-start-line="226" selection-start-column="20" selection-end-line="226" selection-end-column="20" />
             </state>
           </provider>
@@ -72,8 +78,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="537">
-              <caret line="850" column="22" lean-forward="true" selection-start-line="850" selection-start-column="22" selection-end-line="850" selection-end-column="22" />
+            <state relative-caret-position="193">
+              <caret line="865" column="40" selection-start-line="865" selection-start-column="27" selection-end-line="865" selection-end-column="40" />
               <folding>
                 <element signature="e#129#150#0#PHP" expanded="true" />
               </folding>
@@ -168,10 +174,10 @@
         <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_05_095128_add_code_stream_to_camera_list.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Entities/CameraList.php" />
-        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Routes/web.php" />
         <option value="$PROJECT_DIR$/config/filesystems.php" />
         <option value="$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log" />
+        <option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
         <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
       </list>
@@ -343,6 +349,12 @@
               <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
               <item name="video_system" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="filedownload" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
+              <item name="video_system" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
               <item name="files" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -400,7 +412,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="346999000" />
+    <option name="totallyTimeSpent" value="348102000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -431,13 +443,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_06_07_065202_add_field_to_working_surface_0607.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -717,20 +722,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="28" column="48" selection-start-line="28" selection-start-column="48" selection-end-line="28" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="226" column="20" selection-start-line="226" selection-start-column="20" selection-end-line="226" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bootstrap/app.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-153" />
@@ -776,13 +767,32 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="226" column="20" selection-start-line="226" selection-start-column="20" selection-end-line="226" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/storage/logs/laravel-2021-08-10.log">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-840" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="16" column="62" selection-start-line="16" selection-start-column="62" selection-end-line="16" selection-end-column="62" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/filedownload/test.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="537">
-          <caret line="850" column="22" lean-forward="true" selection-start-line="850" selection-start-column="22" selection-end-line="850" selection-end-column="22" />
+        <state relative-caret-position="193">
+          <caret line="865" column="40" selection-start-line="865" selection-start-column="27" selection-end-line="865" selection-end-column="40" />
           <folding>
             <element signature="e#129#150#0#PHP" expanded="true" />
           </folding>
@@ -791,8 +801,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="186" column="28" selection-start-line="186" selection-start-column="28" selection-end-line="186" selection-end-column="28" />
+        <state relative-caret-position="529">
+          <caret line="455" column="40" selection-start-line="455" selection-start-column="40" selection-end-line="455" selection-end-column="40" />
           <folding>
             <element signature="e#51#107#0#PHP" expanded="true" />
           </folding>

Modules/Camera/Database/Migrations/2021_08_10_102022_add_cover_picture_to_camera_list.php

@@ -14,7 +14,7 @@ class AddCoverPictureToCameraList extends Migration
     public function up()
     {
         Schema::table('camera_list', function (Blueprint $table) {
-            $table->text('cover_picture')->nullable()->comment('封面图片');
+            $table->text('cover_picture')->after('code_stream')->nullable()->comment('封面图片');
         });
     }
 

Modules/Camera/Http/Controllers/CameraController.php

@@ -176,7 +176,7 @@ class CameraController extends BaseController
         $formObj->input('com_number', '通道号');
         $formObj->select('code_stream', '视频码流', CameraEnum::CODE_STREAM_EXCHANGE, CameraEnum::CODE_STREAM_SUB);
         $formObj->input('sort', '排序', CameraEnum::DEFAULT_SORT);
-        $formObj->uploadImgs('cover_picture', '封面图片', '/admin/camera/upload/cover_picture', '');
+        $formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture', '');
         $formObj->title = '添加请求链接';
         return $this->from($formObj);
     }
@@ -184,7 +184,6 @@ class CameraController extends BaseController
     //添加摄像头列表操作
     public function cameraListAddPost(Request $request)
     {
-        dd($request->input());
         if (!$request->input('mine_id')) {
             return $this->error(1, '请选择矿区单位');
         }
@@ -267,6 +266,7 @@ class CameraController extends BaseController
         $formObj->select('code_stream', '视频码流', CameraEnum::CODE_STREAM_EXCHANGE);
         $formObj->input('sort', '排序');
         $formObj->select('surface_id', '所属矿区区域', $surface_arr, $default_surface);
+        $formObj->uploadImg('cover_picture', '封面图片', '/admin/camera/upload/cover_picture');
         $formObj->title = '编辑请求链接';
         return $this->from($formObj);
     }
@@ -447,11 +447,15 @@ class CameraController extends BaseController
     //上传摄像头封面图片
     public function cameraUploadCpicture(Request $request)
     {
-        $file = $request->file('image');
+        $file = $request->file('file');
 
         $file_name = CameraServices::uploadFile($file);
 
-        $result = CameraServices::uploadOssFile($file_name);
+        $res = CameraServices::uploadOssFile($file_name);
+
+        CameraServices::delUploadFile();
+
+        $result['image_path'] = $res;
 
         return $this->success($result);
     }

Modules/Camera/Services/CameraServices.php

@@ -73,6 +73,7 @@ class CameraServices
                 'camera_type'   => $params['camera_type'],
                 'camera_source' => $params['camera_source'],
                 'code_stream'   => $params['code_stream'],
+                'cover_picture' => $params['cover_picture'],
                 'created_at'    => date('Y-m-d H:i:s'),
                 'updated_at'    => date('Y-m-d H:i:s'),
             ]
@@ -159,6 +160,7 @@ class CameraServices
                 'camera_type'   => $params['camera_type'],
                 'camera_source' => $params['camera_source'],
                 'code_stream'   => $params['code_stream'],
+                'cover_picture' => $params['cover_picture'],
                 'updated_at'    => date('Y-m-d H:i:s'),
             ]
         );
@@ -827,7 +829,7 @@ class CameraServices
     //上传文件到本地
     public static function uploadFile($file)
     {
-        $destinationPath = public_path() . '/files/';
+        $destinationPath = public_path() . '/filedownload/';
         $extension       = $file->getClientOriginalExtension();
         $fileName        = time() . '.' . $extension;
         $file->move($destinationPath, $fileName);
@@ -837,7 +839,7 @@ class CameraServices
     //oss上传文件
     public static function uploadOssFile($file_name)
     {
-        $file_path = public_path() . '/files/';
+        $file_path = public_path() . '/filedownload/';
 
         try{
             $oss = new OssClient(
@@ -860,4 +862,27 @@ class CameraServices
         }
     }
 
+    //删除临时上传文件
+    public static function delUploadFile($delDir = FALSE)
+    {
+        $path = public_path() . '/filedownload/';
+
+        $handle = opendir($path);
+        if ($handle) {
+            while (false !== ( $item = readdir($handle) )) {
+                if ($item != "." && $item != "..")
+                    is_dir("$path/$item") ? delDirAndFile("$path/$item", $delDir) : unlink("$path/$item");
+            }
+            closedir($handle);
+            if ($delDir)
+                return rmdir($path);
+        }else {
+            if (file_exists($path)) {
+                return unlink($path);
+            } else {
+                return FALSE;
+            }
+        }
+    }
+
 }

public/filedownload/test.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: qiuzijian
+ * Date: 2021-08-10
+ * Time: 20:44
+ */