Compare commits
2 Commits
a405f7cf33
...
6a50ba85dc
| Author | SHA1 | Date |
|---|---|---|
|
|
6a50ba85dc | |
|
|
af49bd63ba |
|
|
@ -64,7 +64,10 @@ class MonitorModeController extends Controller
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
|
|
@ -259,6 +259,12 @@ class DeviceService extends BaseService
|
||||||
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_SOIL);
|
$fieldNameMap = MonitorMode::fieldMap(MonitorMode::TYPE_SOIL);
|
||||||
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_SOIL);
|
$fieldUnitMap = MonitorMode::fieldUnitMap(MonitorMode::TYPE_SOIL);
|
||||||
break;
|
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');
|
$monitorMode->load('devices');
|
||||||
$fieldMap = [];
|
$fieldMap = [];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue