liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

修复监控点设备数据读取异常

main
Jing Li 2023-10-08 11:58:12 +08:00
parent 9b64450dac
commit abab5f7361
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Services/Admin/DeviceService.php
View File

@ -2,13 +2,13 @@
namespace App\Services\Admin; namespace App\Services\Admin;
use App\Admin\Components;
use App\Filters\Admin\DeviceFilter;
use App\Iot\Linkos\HttpClient;
use App\Models\Device; use App\Models\Device;
use App\Models\MonitorMode; use App\Models\MonitorMode;
use App\Models\{MeteorologicalDailyReport, MeteorologicalReport, SoilDailyReport, SoilReport, AirLog, FarmWormPhoto, MonitorDevice, RegionMonitor, Region, FarmWormReport}; use App\Models\{MeteorologicalDailyReport, MeteorologicalReport, SoilDailyReport, SoilReport, AirLog, FarmWormPhoto, MonitorDevice, RegionMonitor, Region, FarmWormReport};
use App\Filters\Admin\DeviceFilter;
use Carbon\Carbon; use Carbon\Carbon;
use App\Admin\Components;
use App\Iot\Linkos\HttpClient;
/** /**
* @method Device getModel() * @method Device getModel()
* @method Device|\Illuminate\Database\Query\Builder query() * @method Device|\Illuminate\Database\Query\Builder query()
@ -280,12 +280,12 @@ class DeviceService extends BaseService
} }
if($diffDays) { if($diffDays) {
$modelQuery = $dayliyReportQuery->whereBetween('reported_at', [$startTime, $endTime]); $modelQuery = (clone $dayliyReportQuery)->whereBetween('reported_at', [$startTime, $endTime]);
}else{ }else{
$modelQuery = $reportQuery->whereDate('reported_at', $day); $modelQuery = (clone $reportQuery)->whereDate('reported_at', $day);
} }
if($modelQuery){ if($modelQuery){
$datalist = $modelQuery->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray(); $datalist = (clone $modelQuery)->where('device_id', $device->id)->get()->keyBy('reported_at')->toArray();
} }
//组装数据； //组装数据；