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

调整错误

dev
vine_liutk 2022-11-23 17:40:58 +08:00
parent fccbec3f85
commit 73681f2d52
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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