Skip to content

M
media-resource
Commit 76e611d5 by 杨昕
Options

添加类别筛选条件

parent 28171e33
Pipeline #10788 passed with stages
in 41 seconds
Showing with 53 additions and 46 deletions
app/Http/Controllers/Api/Client/MediaController.php
......@@ -156,8 +156,13 @@ class MediaController extends Controller
'description' => '',
'sort' => '',
'page_size' => 'integer',
'media_type_id' => ''
]);
if (!isset($request->media_type_id)){
$request->replace(array_merge($request->all(),['media_type_id'=>'5efa9cb5d16f5a214671fd86']));
}
return MediaModel::mediaList($request);
});
......@@ -178,8 +183,6 @@ class MediaController extends Controller
$conf = new Config();
$res = FormUploader::putFile($token,$file->getFilename(),$file->getRealPath(),$conf,null,null);
var_dump($res);die;
}
......
app/Model/MediaModel.php
......@@ -39,9 +39,11 @@ class MediaModel extends Eloquent
*/
public static function mediaList($request){
try{
$medias = MediaModel::query()->raw(function ($collection) use($request){
$limit = (isset($request->page_size) ? (int)($request->page_size) : Constant::PAGE_NUMBER) ;
if ($limit >500){
......@@ -62,6 +64,10 @@ class MediaModel extends Eloquent
$aggregate[]['$match']['_id'] = $request->media_id;
}
if (isset($request->category_id) && !empty($request->category_id)){
$aggregate[]['$match']['media_type_id'] = $request->category_id;
}
// $aggregate[]['$match']['_id'] = 'mda-864371b9a82d1e21';
if (isset($request->media_name) && !empty($request->media_name)){
......@@ -77,11 +83,13 @@ class MediaModel extends Eloquent
}
if (isset($request->start_time)&& !empty($request->start_time)){
$aggregate[]['$match']['start_time'] = ['$gt' => $request->start_time ];
$start_time = new UTCDateTime(strtotime($request->start_time) * 1000);
$aggregate[]['$match']['start_time'] = ['$gt' => $start_time ];
}
if (isset($request->end_time)&& !empty($request->end_time)){
$aggregate[]['$match']['end_time'] = ['$lt' => $request->end_time ];
$end_time = new UTCDateTime(strtotime($request->end_time) * 1000);;
$aggregate[]['$match']['end_time'] = ['$lt' => $end_time ];
}
$aggregate[]['$sort'] = ['start_time' => $sort];
......@@ -174,7 +182,10 @@ class MediaModel extends Eloquent
$media_info = explode("&",$request->media_name);
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first();
$media_type = $request->media_type;
$mediaCatg = MediaCategoryModel::where('_id',$media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
}
......@@ -196,6 +207,12 @@ class MediaModel extends Eloquent
// $create_time = date('Y-m-d H:i:s',time());
// if ($request->shop_id=='100'){
// $mediaCatg = MediaCategoryModel::where('_id','5f3d073a033f5a336b2b4346')->first();
// }
/**
* 处理文件名称，确认是否包含"&"符合
*/
......@@ -217,7 +234,7 @@ class MediaModel extends Eloquent
'user_id' => $request->token_user_id,
'start_time' => $start_time,
'end_time' => $end_time,
'duration' => $request->duration??0
'duration' => $request->duration??"0"
];
}else{
......@@ -225,8 +242,8 @@ class MediaModel extends Eloquent
$data = [
'_id' => $media_id,
'media_name' => $request->media_name,
'media_type_id' => $mediaCatg['_id'],
'media_type'=> $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'],
'media_type' => $mediaCatg['name'],
'book_num' => '',
'book_name' => $request->media_name,
'media_url' => $media_url,
......@@ -237,8 +254,8 @@ class MediaModel extends Eloquent
'username' => $request->token_username,//员工工号
'user_id' => $request->token_user_id,
'start_time' => $start_time,
'end_time' => $end_time??'',
'duration' => $request->duration??0
'end_time' => $end_time,
'duration' => $request->duration??"0"
];
}
......@@ -388,7 +405,8 @@ class MediaModel extends Eloquent
if (empty($media_catg)){
throw new \Exception("媒资类别不存在");
}
$tmp[] = MediaModel::select("_id","book_num","book_name","secret_key","media_url")->whereIn('book_num',$media_ids)->get();
$tmp[] = MediaModel::select("_id","book_num","book_name","secret_key","media_url")->where("media_type_id",$media_catg['_id'])->whereIn('book_num',$media_ids)->get();
}
}catch (\Exception $exception){
......@@ -418,9 +436,9 @@ class MediaModel extends Eloquent
throw new \Exception('媒资不存在！');
}
if (getAdmin()->name != 'offcn'){
throw new \Exception("您无权限操作");
}
// if (getAdmin()->name != 'offcn'){
// throw new \Exception("您无权限操作");
// }
$session = DB::connection('mongodb')->getMongoClient()->startSession();
......@@ -464,6 +482,10 @@ class MediaModel extends Eloquent
if (empty($media)){
throw new \Exception("媒资不存在");
}
if (!isset($media['duration'])){
$media['duration'] = "0";
}
}catch (\Exception $exception){
throw new DatabaseException($exception->getMessage());
......@@ -581,7 +603,7 @@ class MediaModel extends Eloquent
}
$data = [
'status' => $request->status??0
'status' => $request->status??""
// 'description' => $request->description,
];
......@@ -628,9 +650,11 @@ class MediaModel extends Eloquent
//$aggregate[]['$match']['media_url'] = ['$regex' => 'qcoenfz67.bkt.clouddn.com' ];
if (isset($request->username) && !empty($request->username)){
$aggregate[]['$match']['username'] = $request->username;
}
// if (isset($request->username) && !empty($request->username)){
// $aggregate[]['$match']['username'] = $request->username;
// }
// $aggregate[]['$match']['media_name'] = "test3.mp3";
$aggregate[]['$sort'] = ['start_time' => $sort];
......@@ -670,41 +694,18 @@ class MediaModel extends Eloquent
foreach ($medias as $media){
$start_time = $media['start_time'];
$end_time = $media['end_time'];
$create_time = $media['create_time'];
/**
* 构造开始时间，结束时间
*/
if (!is_object($media['start_time'])){
$start_time = strtotime($media['start_time']);
$start_time = new UTCDateTime($start_time * 1000);
}
$tmp_medias = MediaModel::where("media_name",$media['media_name'])->count();
if (!is_object($media['end_time'])){
$end_time = strtotime($media['end_time']);
$end_time = new UTCDateTime($end_time * 1000);
}
if (!is_object($media['create_time'])){
$create_time = strtotime($media['create_time']);
$create_time = new UTCDateTime($create_time * 1000);
}
if ($tmp_medias>1){
MediaModel::deleteMediaById($request,$media['_id']);
$data = [
'start_time' => $start_time,
'end_time' => $end_time,
'create_time'=> $create_time,
];
$flag = MediaModel::where("_id",$media->_id)->update($data);
if ($flag==0){
throw new \Exception("更新失败");
var_dump($tmp_medias);
}
}
}
......@@ -717,4 +718,7 @@ class MediaModel extends Eloquent
}
}
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