Commit 16b4c924 by 杨昕

sf

parent 6726a4be
Pipeline #10885 passed with stages
in 41 seconds
...@@ -5,10 +5,12 @@ namespace App\Http\Controllers\Api; ...@@ -5,10 +5,12 @@ namespace App\Http\Controllers\Api;
use App\Exceptions\FormException; use App\Exceptions\FormException;
use App\Model\MediaModel; use App\Model\MediaModel;
use App\Model\QiniuModel; use App\Model\QiniuModel;
use App\Tool\Constant;
use App\Tool\SrsHookValidate; use App\Tool\SrsHookValidate;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\DB;
use MongoBinData; use MongoBinData;
use MongoDB\BSON\UTCDateTime; use MongoDB\BSON\UTCDateTime;
...@@ -222,6 +224,13 @@ class MediaController extends Controller ...@@ -222,6 +224,13 @@ class MediaController extends Controller
'status' => '', 'status' => '',
'secret_key' => '', 'secret_key' => '',
'media_url' => '', 'media_url' => '',
'media_name' => '',
'description' => '',
'duration' => '',
'media_type' => '',
'shop_id' => '',
],function ($items){ ],function ($items){
$request = $items; $request = $items;
...@@ -235,6 +244,23 @@ class MediaController extends Controller ...@@ -235,6 +244,23 @@ class MediaController extends Controller
}); });
/**
* 设置开始时间与结束时间
*/
$params = array(
'media_type'=> '5efa9cb5d16f5a214671fd86',//默认,中公网校
'access_key'=> '',
'description'=>$request->description??'',
);
if ($request->shop_id=='100'){
$params['media_type'] = "5f3d073a033f5a336b2b4346";
}
$request->replace(array_merge($request->all(),$params));
$id = MediaModel::updateMediaStatus($request,$media_id); $id = MediaModel::updateMediaStatus($request,$media_id);
return $id; return $id;
......
...@@ -598,25 +598,66 @@ class MediaModel extends Eloquent ...@@ -598,25 +598,66 @@ class MediaModel extends Eloquent
$media = MediaModel::where('_id',$media_id)->first(); $media = MediaModel::where('_id',$media_id)->first();
if (empty($media)){ if (empty($media)){
throw new \Exception("媒资不存在");
$mediaCatg = MediaCategoryModel::where('_id',$request->media_type)->first();
if (empty($mediaCatg)){
throw new \Exception("媒资类别不存在");
} }
$create_time = new UTCDateTime(time() * 1000);;
$data = [ $data = [
'status' => $request->status??"", '_id' => $media_id,
'media_name' => $request->media_name??"",
'media_type' => $mediaCatg['name'],
'media_type_id' => $mediaCatg['_id'],
'media_url' => $request->media_url??"",
'access_key' => $request->access_key??"",
'secret_key' => $request->secret_key??"",
'create_time' => $create_time,
'description' => $request->description??"",
'start_time' => $create_time,
'end_time' => $create_time,
'duration' => $request->duration??"0",
"username" => "offcn",
"mis_uid" => "admin"
]; ];
if ($request->status == 1){ $id = MediaModel::insertGetId($data);
LogModel::addlog(["media重新转码"=>json_encode($media)]); LogModel::addlog(["添加媒资信息"=> $data,['媒资ID为:=> '.$id]]);
if ($request->media_secret != $media['secret_key']){ return $id;
$data['secret_key'] = $request->secret_key;
$data['media_url'] = $request->media_url;
} }
$data['status'] = $request->status??"";
if ($request->status){
$data = [
'media_url' => $request->media_url??"",
'media_name' => $request->media_name??"",
'duration' => $request->duration??"0",
'access_key' => $request->access_key??"",
'secret_key' => $request->secret_key??"",
'status' => $request->status
];
LogModel::addlog(["原media信息为"=>json_encode($media),"更新为"=>json_encode($data)]);
} }
// if ($request->status == 1){
// LogModel::addlog(["media重新转码"=>json_encode($media)]);
//
// if ($request->media_secret != $media['secret_key']){
// $data['secret_key'] = $request->secret_key;
// $data['media_url'] = $request->media_url;
// }
// }
$flag = MediaModel::where("_id",$media_id)->update($data); $flag = MediaModel::where("_id",$media_id)->update($data);
if (!$flag){ if (!$flag){
throw new \Exception("Status更新失败"); LogModel::addlog("Status更新失败");
//throw new \Exception("Status更新失败");
} }
LogModel::addlog(["更新媒资信息Status=>".$media_id,$data]); LogModel::addlog(["更新媒资信息Status=>".$media_id,$data]);
...@@ -624,7 +665,7 @@ class MediaModel extends Eloquent ...@@ -624,7 +665,7 @@ class MediaModel extends Eloquent
}catch (\Exception $exception){ }catch (\Exception $exception){
throw new DatabaseException($exception->getMessage()); throw new DatabaseException($exception->getMessage());
} }
return $flag; return $media_id;
} }
......
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