Merge branch 'test' into 'master'

添加根据媒资编号获取媒资列表

See merge request !39

app/Http/Controllers/Api/MediaController.php

@@ -309,5 +309,21 @@ class MediaController extends Controller
 
     }
 
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \App\Exceptions\ControllerException
+     */
+    public function getMediaListByMediaIds(Request $request){
+
+        $data = handler_drive(function () use ($request) {
+            SrsHookValidate::srsHookCallback($request,[
+                'media_ids'     => 'required',
+            ]);
+            return MediaModel::getMediaListByMediaIds($request);
+        });
+        return success($data);
+    }
+
 
 }

app/Model/MediaModel.php

@@ -1063,4 +1063,22 @@ class MediaModel extends Eloquent
         return $orginal_data;
     }
 
+    /**
+     * 根据媒资ids获取媒资列表
+     * @param $request
+     * @return mixed
+     * @throws DatabaseException
+     */
+    public static function getMediaListByMediaIds($request){
+
+        try{
+            $media_ids = $request->media_ids;
+            $medias = MediaModel::select("_id","media_name","duration","secret_key","media_url")->where("status","1")->where("duration",">","0")->where("media_url","!=","")->whereIn('_id',$media_ids)->limit(100)->get();
+        }catch (\Exception $exception){
+            throw new DatabaseException($exception->getMessage());
+        }
+
+        return $medias;
+    }
+
 }

routes/api.php

@@ -50,7 +50,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'user','middleware' => ['api']],
     Route::get("get_media_by_num",'MediaController@getMediaInfoByNum');
     Route::get("get_fervor_m3u8",'MediaController@getMediaForeverM3u8');
 
-
+    Route::post("getMediaListByMediaIds","MediaController@getMediaListByMediaIds");
 
     //Route::get("media_url_change","MediaController@handleMediaUrl");