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

Compare commits

base: liutk:a405f7cf33864c7de1bdf3e1f6fdb1c4ae1c99e4
Branches Tags
liutk:main
liutk:develop
...
compare: liutk:6a50ba85dc622d9a3ae9876a5e8f10159d5f72b9
Branches Tags
liutk:main
liutk:develop

2 Commits
a405f7cf33 ... 6a50ba85dc

Author SHA1 Message Date
vine_liutk 6a50ba85dc 调整 2023-08-22 12:36:58 +08:00
vine_liutk af49bd63ba 添加接口返回数据 2023-08-22 12:34:24 +08:00
2 changed files with 10 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -64,7 +64,10 @@ class MonitorModeController extends Controller
}
}
break;
case MonitorMode::TYPE_INSECT://虫情设备-todo
case MonitorMode::TYPE_INSECT://虫情设备
$startTime = now()->subDays(7)->startOfDay()->format('Y-m-d H:i:s');
$endTime = now()->subDays(1)->endOfDay()->format('Y-m-d H:i:s');
$data = (new DeviceService())->getMonitorModeDeviceData($monitor, $startTime, $endTime);
break;
default:
break;

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

@ -259,6 +259,12 @@ class DeviceService extends BaseService
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_SOIL);
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_SOIL);
break;
case MonitorMode::TYPE_INSECT:
$dayliyReportQuery = FarmWormReport::query();
$reportQuery = FarmWormReport::query();
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_INSECT);
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_INSECT);
break;
}
$monitorMode->load('devices');
$fieldMap = [];