调整补全离线时的缺失数据
parent
3670332227
commit
2d9736f680
|
|
@ -338,8 +338,17 @@ class DeviceController extends Controller
|
||||||
$data = [];
|
$data = [];
|
||||||
foreach ($getArr as $column){
|
foreach ($getArr as $column){
|
||||||
$data[$column] = [];
|
$data[$column] = [];
|
||||||
|
$_value = null;
|
||||||
foreach($xKeys as $key){
|
foreach($xKeys as $key){
|
||||||
$data[$column][$key] = $datalist[$key][$column] ?? null;
|
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);
|
return $this->json($data);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue