Skip to content

M
media-resource
Commit 41c5dbe2 by 杨昕
Options

代码优化

parent 9401382b
Pipeline #9829 passed with stages
in 35 seconds
Showing with 72 additions and 25 deletions
app/Http/Controllers/Api/Client/MediaController.php
...@@ -94,19 +94,18 @@ class MediaController extends Controller ...@@ -94,19 +94,18 @@ class MediaController extends Controller
public function updatehookMedia(Request $request,$id){ public function updatehookMedia(Request $request,$id){
$id = handler_drive(function () use($request){ $id = handler_drive(function () use($request,$id){
SrsHookValidate::srsHookCallback($request,[ SrsHookValidate::srsHookCallback($request,[
'media_name' => 'required', 'media_name' => 'required',
'media_type' => 'required', 'media_type' => 'required',
'media_id' => 'required', 'media_id' => 'required',
'access_key' => '', 'access_key' => '',
'secret_key' => '', 'secret_key' => '',
'media_url' => 'required', 'media_url' => 'required',
]); ]);
$id = MediaModel::updatehookMedia($request); MediaModel::updatehookMedia($request,$id);
return $id; return $id;
}); });
......
app/Model/MediaModel.php
...@@ -41,10 +41,13 @@ class MediaModel extends Eloquent ...@@ -41,10 +41,13 @@ class MediaModel extends Eloquent
} }
$medias = MediaModel::where($where)->paginate(10); $medias = MediaModel::where($where)->paginate(10);
foreach ($medias as $media){ foreach ($medias as $media){
$media['media_type'] = $tmp[$media['media_type']]; $media['media_type'] = $tmp[$media['media_type_id']];
} }
}catch (\Exception $exception){ }catch (\Exception $exception){
throw new DatabaseException($exception->getMessage()); throw new DatabaseException($exception->getMessage());
} }
...@@ -72,7 +75,7 @@ class MediaModel extends Eloquent ...@@ -72,7 +75,7 @@ class MediaModel extends Eloquent
*/ */
$media_info = explode("&",$request->media_name); $media_info = explode("&",$request->media_name);
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first(); $mediaCatg = MediaCategoryModel::where('name',$request->media_type)->first();
if (empty($mediaCatg)){ if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在"); throw new \Exception("媒资类别不存在");
} }
...@@ -85,10 +88,10 @@ class MediaModel extends Eloquent ...@@ -85,10 +88,10 @@ class MediaModel extends Eloquent
$data = [ $data = [
'_id' => $media_id, '_id' => $media_id,
'media_name' => $request->media_name, 'media_name' => $request->media_name,
'media_type' => $mediaCatg->_id, 'media_type_id' => $mediaCatg['_id'],
'media_category'=> $mediaCatg['name'], 'media_type' => $mediaCatg['name'],
'book_num' => $media_info[0], 'book_num' => $media_info[0],
'book_name' => $media_info[1], 'book_name' => $media_info[1],
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
...@@ -135,7 +138,51 @@ class MediaModel extends Eloquent ...@@ -135,7 +138,51 @@ class MediaModel extends Eloquent
throw new \Exception("媒资不存在"); throw new \Exception("媒资不存在");
} }
$flag = MediaModel::where("_id",$id)->update($request->all()); //hb15011&河北公务员考试试题
/**
* 媒资名称是由课程编号与课程名称组成
*/
$media_info = explode("&",$request->media_name);
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
}
/**
* 处理文件名称，确认是否包含"&"符合
*/
if (count($media_info)>=2){
$data = [
'_id' => $id,
'media_name' => $request->media_name,
'media_type' => $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'],
'book_num' => $media_info[0],
'book_name' => $media_info[1],
'media_url' => $request->media_url,
'access_key' => $request->access_key,
'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time())
];
}else{
$data = [
'_id' => $id,
'media_name' => $request->media_name,
'media_type' => $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'],
'book_num' => '',
'book_name' => $request->media_name,
'media_url' => $request->media_url,
'access_key' => $request->access_key,
'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time())
];
}
$flag = MediaModel::where("_id",$id)->update($data);
if (!$flag){ if (!$flag){
throw new \Exception("更新失败"); throw new \Exception("更新失败");
} }
...@@ -195,16 +242,16 @@ class MediaModel extends Eloquent ...@@ -195,16 +242,16 @@ class MediaModel extends Eloquent
} }
$data = [ $data = [
'_id' => $id, '_id' => $id,
'media_name' => $request->media_name, 'media_name' => $request->media_name,
'media_type' => $mediaCatg->_id, 'media_type_id' => $mediaCatg["_id"],
'media_category'=> $mediaCatg['name'], 'media_type' => $mediaCatg['name'],
'book_num' => $media_info[0], 'book_num' => $media_info[0],
'book_name' => $media_info[1], 'book_name' => $media_info[1],
'media_url' => $request->media_url, 'media_url' => $request->media_url,
'access_key' => $request->access_key, 'access_key' => $request->access_key,
'secret_key' => $request->secret_key, 'secret_key' => $request->secret_key,
'create_time' => date('Y-m-d H:i:s',time()) 'create_time' => date('Y-m-d H:i:s',time())
]; ];
$flag = MediaModel::where('_id',$id)->update($data); $flag = MediaModel::where('_id',$id)->update($data);
......
routes/api.php
...@@ -27,6 +27,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'v1', 'middleware' => ['auth']], ...@@ -27,6 +27,7 @@ Route::group(['namespace' => 'Api', 'prefix' => 'v1', 'middleware' => ['auth']],
Route::get('generate_media_id', 'Client\MediaController@index'); Route::get('generate_media_id', 'Client\MediaController@index');
Route::get('upload_token', 'Client\MediaController@getUploadMediaToken'); Route::get('upload_token', 'Client\MediaController@getUploadMediaToken');
Route::post('hook_restore', 'Client\MediaController@hookRestoreMedia'); Route::post('hook_restore', 'Client\MediaController@hookRestoreMedia');
Route::post('update_media/{id}', 'Client\MediaController@updatehookMedia');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment