兼容三个mongoDate时间字段

app/Http/Controllers/Api/MediaController.php

@@ -6,6 +6,7 @@ use App\Exceptions\FormException;
 use App\Model\MediaModel;
 use App\Model\QiniuModel;
 use App\Tool\SrsHookValidate;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -120,7 +121,8 @@ class MediaController extends Controller
                 'description' => '',
             ]));
 
-            $data_time = date('Y-m-d H:i:s',time());
+            $data_time = Carbon::now();
+
 
             $params = array(
                 'media_id'  => 'mda-'.generateRandomNum(16),
@@ -134,7 +136,7 @@ class MediaController extends Controller
 
             $request->replace(array_merge($request->all(),$params));
 
-            $id = MediaModel::hookRestoreMedia($request);
+            $id = MediaModel::hookRestoreMedia($request,'baidu');
 
             return $id;
         });

app/Http/Controllers/Web/MediaController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web;
 use App\Model\MediaCategoryModel;
 use App\Model\MediaModel;
 use App\Tool\SrsHookValidate;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -118,6 +119,17 @@ class MediaController extends Controller
                 'media_url'   => 'required',
             ]);
 
+            $data_time = Carbon::now();
+
+            $params = array(
+                'start_time'=> $data_time,
+                'end_time'  => $data_time,
+                'create_time'=> $data_time,
+            );
+
+            $request->replace(array_merge($request->all(),$params));
+
+
             return MediaModel::hookRestoreMedia($request);
 
         });

app/Model/MediaModel.php

@@ -4,11 +4,12 @@ namespace App\Model;
 
 use App\Exceptions\DatabaseException;
 use App\Tool\Constant;
+use Carbon\Carbon;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\DB;
 use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
-
+use MongoDB\BSON\UTCDateTime;
 
 
 class MediaModel extends Eloquent
@@ -104,8 +105,30 @@ class MediaModel extends Eloquent
                 $aggregate[]['$skip'] = $skip;
                 $aggregate[]['$limit'] = $limit;
 
+                $tmp_arr = $collection->aggregate($aggregate)->toArray();
 
-                return new LengthAwarePaginator($collection->aggregate($aggregate)->toArray(), $count, $limit, $page,[
+                $tmp_arr = collect($tmp_arr);
+
+                /**
+                 * 将mongoDate 转化为普通时间
+                 */
+                foreach ($tmp_arr as $media){
+
+                    if (is_object($media['end_time'])){
+                        $media['end_time'] = Carbon::parse($media['end_time']['date'])->toDateTimeString();
+                    }
+
+                    if (is_object($media['start_time'])){
+                        $media['start_time'] = Carbon::parse($media['start_time']['date'])->toDateTimeString();
+                    }
+
+                    if (is_object($media['create_time'])){
+                        $media['create_time'] = Carbon::parse($media['create_time']['date'])->toDateTimeString();
+                    }
+                }
+
+
+                return new LengthAwarePaginator($tmp_arr, $count, $limit, $page,[
                     'path' => Paginator::resolveCurrentPath(),
                     'pageName' => 'page',
                 ]);
@@ -126,7 +149,7 @@ class MediaModel extends Eloquent
      * @return mixed
      * @throws DatabaseException
      */
-    public static function hookRestoreMedia($request){
+    public static function hookRestoreMedia($request,$category = "media"){
 
         try{
 
@@ -158,6 +181,19 @@ class MediaModel extends Eloquent
 
             $media_url = str_replace("http:","https:",$media_url);
 
+            /**
+             * 构造开始时间，结束时间
+             */
+            $start_time = strtotime($request->start_time);
+            $end_time = strtotime($request->end_time);
+
+            $start_time = Carbon::create(date('Y',$start_time),date('m',$start_time),12,
+                date('H',$start_time),date('i',$start_time),date('s',$start_time));
+            $end_time = Carbon::create(date('Y',$end_time),date('m',$end_time),date('d',$end_time),
+                date('H',$end_time),date('i',$end_time),date('s',$end_time));
+
+            $create_time = Carbon::now();
+
 
             /**
              * 处理文件名称，确认是否包含"&"符合
@@ -174,12 +210,12 @@ class MediaModel extends Eloquent
                     'media_url'     => $media_url,
                     'access_key'    => $request->access_key,
                     'secret_key'    => $request->secret_key,
-                    'create_time'   => date('Y-m-d H:i:s',time()),
+                    'create_time'   => $request->create_time??$create_time,
                     'description'   => $request->description,
                     'username'      => $request->token_username,//员工工号
                     'user_id'       => $request->token_user_id,
-                    'start_time'    => $request->start_time??'',
-                    'end_time'      => $request->end_time??'',
+                    'start_time'    => $start_time,
+                    'end_time'      => $end_time,
                 ];
 
             }else{
@@ -194,7 +230,7 @@ class MediaModel extends Eloquent
                     'media_url'     => $media_url,
                     'access_key'    => $request->access_key,
                     'secret_key'    => $request->secret_key,
-                    'create_time'   => date('Y-m-d H:i:s',time()),
+                    'create_time'   => $create_time,
                     'description'   => $request->description,
                     'username'      => $request->token_username,//员工工号
                     'user_id'       => $request->token_user_id,
@@ -203,6 +239,10 @@ class MediaModel extends Eloquent
                 ];
             }
 
+            if ($category == 'baidu'){
+                $data['status'] = 0;
+            }
+
             $id = MediaModel::insertGetId($data);
 
             LogModel::addlog(["添加媒资信息"=> $data,['媒资ID为：=> '.$id]]);