diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php index 758886e..caa47b8 100644 --- a/app/Http/Controllers/DeviceController.php +++ b/app/Http/Controllers/DeviceController.php @@ -306,7 +306,7 @@ class DeviceController extends Controller if($diffDays) { $modelQuery = MeteorologicalMonitoringDailyLog::query()->whereBetween('monitored_at', [$startTime, $endTime]); }else{ - $modelQuery = MeteorologicalMonitoringLog::query()->whereDate('monitored_at', now()); + $modelQuery = MeteorologicalMonitoringLog::query()->whereDate('monitored_at', $day); } break; case DeviceType::Soil://土壤设备 @@ -321,7 +321,7 @@ class DeviceController extends Controller if($diffDays) { $modelQuery = SoilMonitoringDailyLog::query()->whereBetween('monitored_at', [$startTime, $endTime]); }else{ - $modelQuery = SoilMonitoringLog::query()->whereDate('monitored_at', now()); + $modelQuery = SoilMonitoringLog::query()->whereDate('monitored_at', $day); } break; case DeviceType::WaterQuality://水质设备 @@ -336,7 +336,7 @@ class DeviceController extends Controller if($diffDays) { $modelQuery = WaterQualityMonitoringDailyLog::query()->whereBetween('monitored_at', [$startTime, $endTime]); }else{ - $modelQuery = WaterQualityMonitoringLog::query()->whereDate('monitored_at', now()); + $modelQuery = WaterQualityMonitoringLog::query()->whereDate('monitored_at', $day); } break; } @@ -348,15 +348,15 @@ class DeviceController extends Controller $data[$column] = []; $_value = null; foreach($xKeys as $key){ - if($datalist[$key][$column] ?? null){//如果存在数据则暂存该值 - $_value = $datalist[$key][$column]; - } - //判断是否超过离线时间; - if(true){//未超过, 判断和设备离线时间关系-todo - $data[$column][$key] = $_value; - }else{ + // if($datalist[$key][$column] ?? null){//如果存在数据则暂存该值 + // $_value = $datalist[$key][$column]; + // } + // //判断是否超过离线时间; + // if(true){//未超过, 判断和设备离线时间关系-todo + // $data[$column][$key] = $_value; + // }else{ $data[$column][$key] = $datalist[$key][$column] ?? null; - } + // } } } return $this->json($data);