大王椰大屏yl 接口数据展示

app/Http/Controllers/Api/ScreenController.php

@@ -300,6 +300,11 @@ class ScreenController extends BaseController
 //        $end = isset($request['start_time']) ? $request['start_time'] : time();
         $key = DeviceSite::where('site',1)->wherein('title',['主缸压力','压力'])->groupBy('key')->pluck('key')->toArray();
         $list = DeviceData::where('crt_time','>=',$start)->wherein('dev_eui',$key)->select(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H:%i') as c"),'device_name','happening_data')->get()->toArray();
+        if(empty($list)) {
+            $time = DeviceData::max('crt_time');
+            $time = $time-8000;
+            $list = DeviceData::where('crt_time','>=',$time)->wherein('dev_eui',$key)->select(DB::raw("DATE_FORMAT(FROM_UNIXTIME(crt_time), '%Y-%m-%d %H:%i') as c"),'device_name','happening_data')->get()->toArray();
+        }
 
         $list_key = [];
         $device_key = [];
@@ -314,6 +319,7 @@ class ScreenController extends BaseController
 //        die('ss');
         $time_list = [];
         $data_key = [];
+        if(! empty($time)) $start = $time;
         for ($i=$start;$i<time();$i= $i+60){
             $time_key = date('Y-m-d H:i',$i);
             $time_list[] = $time_key;