liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

monitor history

develop
panliang 2023-07-28 12:14:09 +08:00
parent 4c9d067325
commit b0d9dbe3f6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Controller.php
View File

@ -7,7 +7,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Http\Resources\Json\ResourceCollection ;
use Illuminate\Http\Resources\Json\ResourceCollection;
use Illuminate\Support\Arr;
class Controller extends BaseController
@ -16,7 +16,7 @@ class Controller extends BaseController
public function json($data, $code = 0, $message = '')
{
if ($data instanceof ResourceCollection ) {
if ($data instanceof ResourceCollection) {
$data = $data->resource;
}
$result = ['data' => $data ?: '', 'status' => $code, 'msg' => $message];

6
app/Services/Admin/DeviceService.php
View File

@ -35,9 +35,11 @@ class DeviceService extends BaseService
$url = data_get($item->extends, $history ? 'rtsp_history' : 'rtsp_url');
$src = null;
if ($base && $url) {
// 查看历史监控
// 查看历史监控 &starttime=2023_02_02_14_00_00&endtime=2023_02_02_15_00_00
if ($history && $start && $end) {
$url .= '?start=' . date('Y-m-d', $start) . '&end=' . data('Y-m-d', $end);
$start_format = Carbon::createFromTimestamp($start)->startOfDay()->format('Y_m_d_H_i_s');
$end_format = Carbon::createFromTimestamp($end)->endOfDay()->format('Y_m_d_H_i_s');
$url .= (str_contains($url, '?') ? '&' : '?') .'starttime=' . $start_format . '&endtime=' . $end_format;
}
$src = $base . base64_encode($url);
}