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

Update

main
Jing Li 2023-10-08 17:13:01 +08:00
parent a92b5a1dd6
commit 7955aa8cc3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Api/MonitorModeController.php
View File

@ -8,7 +8,7 @@ use App\Http\Resources\DeviceResource;
use App\Http\Resources\FarmWormPhotoResource; use App\Http\Resources\FarmWormPhotoResource;
use App\Http\Resources\MonitorModeResource; use App\Http\Resources\MonitorModeResource;
use App\Models\FarmWormPhoto; use App\Models\FarmWormPhoto;
use App\Models\MeteorologicalDailyReport; use App\Models\MeteorologicalReport;
use App\Models\MonitorMode; use App\Models\MonitorMode;
use App\Services\Admin\DeviceService; use App\Services\Admin\DeviceService;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -56,7 +56,7 @@ class MonitorModeController extends Controller
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_METEOROLOGICAL); $fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_METEOROLOGICAL);
foreach($monitor->devices as $device){ foreach($monitor->devices as $device){
$_fields = explode(',', $device->pivot->fields); $_fields = explode(',', $device->pivot->fields);
$reportData = MeteorologicalDailyReport::where('device_id', $device->id)->orderBy('reported_at', 'desc')->first()?->toArray() ?? []; $reportData = MeteorologicalReport::where('device_id', $device->id)->orderBy('reported_at', 'desc')->first()?->toArray() ?? [];
foreach($_fields as $field){ foreach($_fields as $field){
$data[$field] = [ $data[$field] = [
'name' => $fieldNameMap[$field], 'name' => $fieldNameMap[$field],