From 2d9736f680333123b85b7991643f577c1eb378a0 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Nov 2022 17:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A5=E5=85=A8=E7=A6=BB?=
 =?UTF-8?q?=E7=BA=BF=E6=97=B6=E7=9A=84=E7=BC=BA=E5=A4=B1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/DeviceController.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index aa0a7f5..1e1b2fc 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -338,8 +338,17 @@ class DeviceController extends Controller
         $data = [];
         foreach ($getArr as $column){
             $data[$column] = [];
+            $_value = null;
             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);