pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

dev
vine_liutk 2022-11-23 17:37:31 +08:00
parent 2d9736f680
commit fccbec3f85
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/DeviceController.php
View File

@ -257,11 +257,16 @@ class DeviceController extends Controller
$startTime = $request->input('start_time'); $startTime = $request->input('start_time');
$endTime = $request->input('end_time'); $endTime = $request->input('end_time');
$diffDays = 0; $diffDays = 0;
$day = date('Y-m-d');
//如果传了开始时间和结束时间，计算中间天数 //如果传了开始时间和结束时间，计算中间天数
if($startTime && $endTime){ if($startTime && $endTime){
$startDay = Carbon::parse($startTime); if($startTime == $endTime){//查询某一天
$endDay = Carbon::parse($endTime); $day = $startTime;
$diffDays = $startDay->diffInDays($endDay, false); }else{
$startDay = Carbon::parse($startTime);
$endDay = Carbon::parse($endTime);
$diffDays = $startDay->diffInDays($endDay, false);
}
} }
$xKeys = []; $xKeys = [];
@ -271,9 +276,12 @@ class DeviceController extends Controller
} }
}else{ }else{
//调整截至到当前小时 //调整截至到当前小时
$h = date('H'); $h = 23;
if($day == date('Y-m-d')){
$h = date('H');
}
for ($i = 0; $i < ($h+1); $i++) { for ($i = 0; $i < ($h+1); $i++) {
$xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00'; $xKeys[] = $day.' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00';
} }
} }
$device = Device::find($deviceId); $device = Device::find($deviceId);