Skip to content

M
media-resource
Commit b21c1893 by 杨昕
Options

设置结束时间不能小于开始时间

parent c92afe44
Pipeline #9888 passed with stages
in 34 seconds
Showing with 16 additions and 4 deletions
app/Http/Controllers/Api/Client/MediaController.php
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api\Client; namespace App\Http\Controllers\Api\Client;
use App\Exceptions\FormException;
use App\Model\MediaModel; use App\Model\MediaModel;
use App\Model\QiniuModel; use App\Model\QiniuModel;
use App\Tool\SrsHookValidate; use App\Tool\SrsHookValidate;
...@@ -86,18 +87,21 @@ class MediaController extends Controller ...@@ -86,18 +87,21 @@ class MediaController extends Controller
'media_url' => 'required', 'media_url' => 'required',
'description' => '', 'description' => '',
'start_time' => 'required|date', 'start_time' => 'required|date',
'end_time' => 'required|date|after:start_time', 'end_time' => 'required|date',
],config('app.client_request_parameters')),function(...$items){ ],config('app.client_request_parameters')),function(...$items){
$request = $items[0]; $request = $items[0];
$dateTimeReg = '/^(0[1-9]|1[0-2])-(3[01]|[12]\d|0[1-9]) ([0-5]\d):([0-5]\d)$/'; $dateTimeReg = '/^(0[1-9]|1[0-2])-(3[01]|[12]\d|0[1-9]) ([0-5]\d):([0-5]\d)$/';
check($request->start_time,$dateTimeReg); check($request->start_time,$dateTimeReg);
check($request->end_time,$dateTimeReg); check($request->end_time,$dateTimeReg);
if ($request->start_time > $request->end_time){
throw new FormException("结束时间不能小于开始时间");
}
},[ },[
'start_time.date' => '开始时间格式错误', 'start_time.date' => '开始时间格式错误',
'start_time.required'=> '开始时间不能为空', 'start_time.required'=> '开始时间不能为空',
'end_time.required' => '结束时间不能为空', 'end_time.required' => '结束时间不能为空',
'end_time.date' => '结束时间格式错误', 'end_time.date' => '结束时间格式错误',
'end_time.after' => '结束时间不能小于开始时间',
]); ]);
...@@ -129,18 +133,22 @@ class MediaController extends Controller ...@@ -129,18 +133,22 @@ class MediaController extends Controller
'media_url' => 'required', 'media_url' => 'required',
'description' => '', 'description' => '',
'start_time' => 'required|date', 'start_time' => 'required|date',
'end_time' => 'required|date|after:start_time', 'end_time' => 'required|date',
],function(...$items){ ],function(...$items){
$request = $items[0]; $request = $items[0];
$dateTimeReg = '/^(0[1-9]|1[0-2])-(3[01]|[12]\d|0[1-9]) ([0-5]\d):([0-5]\d)$/'; $dateTimeReg = '/^(0[1-9]|1[0-2])-(3[01]|[12]\d|0[1-9]) ([0-5]\d):([0-5]\d)$/';
check($request->start_time,$dateTimeReg); check($request->start_time,$dateTimeReg);
check($request->end_time,$dateTimeReg); check($request->end_time,$dateTimeReg);
if ($request->start_time > $request->end_time){
throw new FormException("结束时间不能小于开始时间");
}
},[ },[
'start_time.date' => '开始时间格式错误', 'start_time.date' => '开始时间格式错误',
'start_time.required'=> '开始时间不能为空', 'start_time.required'=> '开始时间不能为空',
'end_time.required' => '结束时间不能为空', 'end_time.required' => '结束时间不能为空',
'end_time.date' => '结束时间格式错误', 'end_time.date' => '结束时间格式错误',
'end_time.after' => '结束时间不能小于开始时间',
]); ]);
MediaModel::updatehookMedia($request,$id); MediaModel::updatehookMedia($request,$id);
......
resources/views/admin/media/media_list.blade.php
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
<script src="{{ asset('xadmin/extra/datepicker/js/moment.js')}}"></script> <script src="{{ asset('xadmin/extra/datepicker/js/moment.js')}}"></script>
<script src="{{ asset('xadmin/extra/datepicker/js/daterangepicker.js')}}"></script> <script src="{{ asset('xadmin/extra/datepicker/js/daterangepicker.js')}}"></script>
<script src="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.common.js"></script>
<link rel="stylesheet" href="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.css">
<script src="https://cdn.bootcdn.net/ajax/libs/datepicker/1.0.9/datepicker.js"></script>
<body> <body>
<!--==================================================== <!--====================================================
......
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