From 73681f2d52cee37a041ff349234181691425eedd Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 23 Nov 2022 17:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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);