1
0
Fork 0

优化 linkos 设备报告

develop
李静 2023-05-12 13:04:49 +08:00
parent c01420471d
commit 4b467fa7b0
2 changed files with 166 additions and 174 deletions

View File

@ -6,6 +6,7 @@ use App\Models\Device;
use App\Models\MeteorologicalReport;
use App\Models\SoilReport;
use App\Models\WaterQualityReport;
use App\Services\DeviceLogService;
use Illuminate\Console\Command;
use Illuminate\Support\Arr;
@ -27,11 +28,18 @@ class DeviceLogReportCommand extends Command
*/
protected $description = '按设备厂商生成监控报告';
/**
* @var \App\Services\DeviceLogService
*/
protected $deviceLogService;
/**
* Execute the console command.
*/
public function handle()
public function handle(DeviceLogService $deviceLogService)
{
$this->deviceLogService = $deviceLogService;
$factory = $this->argument('factory');
$sleep = (int) value(fn ($sleep) => is_numeric($sleep) ? $sleep : 300, $this->option('sleep'));
@ -43,7 +51,15 @@ class DeviceLogReportCommand extends Command
foreach ($devices as $device) {
switch ($device->factory?->key) {
case 'link-os':
$this->createReportToLinkosDevice($device);
switch ($device->type) {
case Device::TYPE_METEOROLOGICAL:
$this->createReportToLinkosMeteorologicalDevice($device);
break;
case Device::TYPE_WATER_QUALITY:
$this->createReportToLinkosWaterQualityDevice($device);
break;
}
break;
}
}
@ -52,95 +68,9 @@ class DeviceLogReportCommand extends Command
};
}
protected function createReportToLinkosDevice(Device $device): void
{
switch ($device->type) {
case Device::TYPE_SOIL:
$this->createReportToLinkosSoilDevice($device);
break;
case Device::TYPE_METEOROLOGICAL:
$this->createReportToLinkosMeteorologicalDevice($device);
break;
case Device::TYPE_WATER_QUALITY:
$this->createReportToLinkosWaterQualityDevice($device);
break;
}
}
protected function createReportToLinkosSoilDevice(Device $device): void
{
$lastSoilReport = SoilReport::where('device_id', $device->id)
->latest('reported_at')
->first();
$lastReportedAt = $lastSoilReport?->reported_at
?: $device->logs()->oldest('reported_at')->value('reported_at');
if ($lastReportedAt === null) {
return;
}
$latestReportedAt = $device->logs()->latest('reported_at')->value('reported_at');
if ($latestReportedAt === null) {
return;
}
/** @var \Carbon\Carbon */
$startAt = $lastReportedAt->copy()->startOfHour();
/** @var \Carbon\Carbon */
$endAt = $latestReportedAt->copy()->startOfHour();
do {
/** @var \Illuminate\Database\Eloquent\Collection */
$logs = $device->logs()
->whereBetween('reported_at', [$startAt, $startAt->copy()->endOfHour()])
->oldest('reported_at')
->get();
if ($logs->isNotEmpty()) {
$soilReport = SoilReport::firstOrCreate(
[
'device_id' => $device->id,
'reported_at' => $startAt,
],
Arr::except($lastSoilReport?->setHidden([])?->attributesToArray() ?: [], ['reported_at'])
);
/** @var \App\Models\DeviceLog */
foreach ($logs as $log) {
foreach ([
'conductivity' => 'conductivity',
'soil_humidity' => 'humidity',
'soil_temperature' => 'temperature',
'nitrogen_content' => 'n',
'potassium_content' => 'k',
'phosphorus_content' => 'p',
] as $key => $attribute) {
if (! is_array($log->data) || ! array_key_exists($key, $log->data)) {
continue;
}
$soilReport->{$attribute} = $log->data[$key];
}
$lastSoilReport = tap($soilReport)->save();
}
}
$startAt->addHour();
} while ($endAt->gte($startAt));
}
protected function createReportToLinkosMeteorologicalDevice(Device $device): void
{
$lastMeteorologicalReport = MeteorologicalReport::where('device_id', $device->id)
->latest('reported_at')
->first();
$lastReportedAt = $lastMeteorologicalReport?->reported_at
$lastReportedAt = MeteorologicalReport::where('device_id', $device->id)->latest('reported_at')->value('reported_at')
?: $device->logs()->oldest('reported_at')->value('reported_at');
if ($lastReportedAt === null) {
@ -159,51 +89,7 @@ class DeviceLogReportCommand extends Command
$endAt = $latestReportedAt->copy()->startOfHour();
do {
/** @var \Illuminate\Database\Eloquent\Collection */
$logs = $device->logs()
->whereBetween('reported_at', [$startAt, $startAt->copy()->endOfHour()])
->oldest('reported_at')
->get();
if ($logs->isNotEmpty()) {
$meteorologicalReport = MeteorologicalReport::firstOrCreate(
[
'device_id' => $device->id,
'reported_at' => $startAt,
],
Arr::except($lastMeteorologicalReport?->setHidden([])?->attributesToArray() ?: [], ['reported_at'])
);
/** @var \App\Models\DeviceLog */
foreach ($logs as $log) {
foreach ([
'current_rainfall' => 'today_rainfall',
'day_rainfall' => 'yesterday_rainfall',
'accumulate_rainfall' => 'accumulate_rainfall',
'moment_rainfall' => 'moment_rainfall',
'pm10_concentration' => 'pm10',
'pm25_concentration' => 'pm25',
'box_illumination' => 'box_illumination',
'box_pressure' => 'box_pressure',
'box_carbon' => 'box_co2',
'box_temperature' => 'box_temperature',
'box_humidity' => 'box_humidity',
'box_noise' => 'box_noise',
'wind_degree' => 'wind_degree',
'wind_direction' => 'wind_direction',
'wind_power' => 'wind_power',
'wind_speed' => 'wind_speed',
] as $key => $attribute) {
if (! is_array($log->data) || ! array_key_exists($key, $log->data)) {
continue;
}
$meteorologicalReport->{$attribute} = $log->data[$key];
}
$lastMeteorologicalReport = tap($meteorologicalReport)->save();
}
}
$this->deviceLogService->createReportToLinkosMeteorologicalDevice($device, $startAt->copy());
$startAt->addHour();
} while ($endAt->gte($startAt));
@ -211,11 +97,7 @@ class DeviceLogReportCommand extends Command
protected function createReportToLinkosWaterQualityDevice(Device $device): void
{
$lastWaterQualityReport = WaterQualityReport::where('device_id', $device->id)
->latest('reported_at')
->first();
$lastReportedAt = $lastWaterQualityReport?->reported_at
$lastReportedAt = WaterQualityReport::where('device_id', $device->id)->latest('reported_at')->value('reported_at')
?: $device->logs()->oldest('reported_at')->value('reported_at');
if ($lastReportedAt === null) {
@ -234,41 +116,7 @@ class DeviceLogReportCommand extends Command
$endAt = $latestReportedAt->copy()->startOfHour();
do {
/** @var \Illuminate\Database\Eloquent\Collection */
$logs = $device->logs()
->whereBetween('reported_at', [$startAt, $startAt->copy()->endOfHour()])
->oldest('reported_at')
->get();
if ($logs->isNotEmpty()) {
$waterQualityReport = WaterQualityReport::firstOrCreate(
[
'device_id' => $device->id,
'reported_at' => $startAt,
],
Arr::except($lastWaterQualityReport?->setHidden([])?->attributesToArray() ?: [], ['reported_at'])
);
/** @var \App\Models\DeviceLog */
foreach ($logs as $log) {
foreach ([
'chlorine' => 'chlorine',
'conductivity' => 'conductivity',
'oxygen' => 'oxygen',
'ph' => 'ph',
'temp' => 'temperature',
'turbidity' => 'turbidity',
] as $key => $attribute) {
if (! is_array($log->data) || ! array_key_exists($key, $log->data)) {
continue;
}
$waterQualityReport->{$attribute} = $log->data[$key];
}
$lastWaterQualityReport = tap($waterQualityReport)->save();
}
}
$this->deviceLogService->createReportToLinkosWaterQualityDevice($device, $startAt->copy());
$startAt->addHour();
} while ($endAt->gte($startAt));

View File

@ -78,6 +78,150 @@ class DeviceLogService
} while ($countResults === $perPage);
}
/**
* 创建 linkos 气象设备报告
*/
public function createReportToLinkosMeteorologicalDevice(Device $device, Carbon $time)
{
$start = $time->copy()->startOfHour();
/** @var \Illuminate\Database\Eloquent\Collection */
$logs = $device->logs()
->whereBetween('reported_at', [$start, $start->copy()->endOfHour()])
->oldest('reported_at')
->get();
if ($logs->isEmpty()) {
return;
}
$attributes = [];
/** @var \App\Models\DeviceLog */
foreach ($logs as $log) {
if (! is_array($data = $log->data)) {
continue;
}
foreach ([
'current_rainfall' => 'today_rainfall',
'day_rainfall' => 'yesterday_rainfall',
'accumulate_rainfall' => 'accumulate_rainfall',
'moment_rainfall' => 'moment_rainfall',
'pm10_concentration' => 'pm10',
'pm25_concentration' => 'pm25',
'box_illumination' => 'box_illumination',
'box_pressure' => 'box_pressure',
'box_carbon' => 'box_co2',
'box_temperature' => 'box_temperature',
'box_humidity' => 'box_humidity',
'box_noise' => 'box_noise',
'wind_degree' => 'wind_degree',
'wind_direction' => 'wind_direction',
'wind_power' => 'wind_power',
'wind_speed' => 'wind_speed',
] as $k => $v) {
if (! array_key_exists($k, $data)) {
continue;
}
$attributes[$v] = $data[$k];
}
}
if (
$meteorologicalReport = MeteorologicalReport::where('device_id', $device->id)
->where('reported_at', $start)
->first()
) {
$meteorologicalReport->update($attributes);
} else {
if (
$lastMeteorologicalReport = MeteorologicalReport::where('device_id', $device->id)
->where('reported_at', $start->copy()->subHour())
->first()
) {
foreach ($attributes as $k => $v) {
if ($v === null) {
$attributes[$k] = $lastMeteorologicalReport->{$k};
}
}
}
MeteorologicalReport::create(array_merge($attributes, [
'device_id' => $device->id,
'reported_at' => $start,
]));
}
}
/**
* 创建 linkos 水质设备报告
*/
public function createReportToLinkosWaterQualityDevice(Device $device, Carbon $time)
{
$start = $time->copy()->startOfHour();
/** @var \Illuminate\Database\Eloquent\Collection */
$logs = $device->logs()
->whereBetween('reported_at', [$start, $start->copy()->endOfHour()])
->oldest('reported_at')
->get();
if ($logs->isEmpty()) {
return;
}
$attributes = [];
/** @var \App\Models\DeviceLog */
foreach ($logs as $log) {
if (! is_array($data = $log->data)) {
continue;
}
foreach ([
'chlorine' => 'chlorine',
'conductivity' => 'conductivity',
'oxygen' => 'oxygen',
'ph' => 'ph',
'temp' => 'temperature',
'turbidity' => 'turbidity',
] as $k => $v) {
if (! array_key_exists($k, $data)) {
continue;
}
$attributes[$v] = $data[$k];
}
}
if (
$waterQualityReport = WaterQualityReport::where('device_id', $device->id)
->where('reported_at', $start)
->first()
) {
$waterQualityReport->update($attributes);
} else {
if (
$lastWaterQualityReport = WaterQualityReport::where('device_id', $device->id)
->where('reported_at', $start->copy()->subHour())
->first()
) {
foreach ($attributes as $k => $v) {
if ($v === null) {
$attributes[$k] = $lastWaterQualityReport->{$k};
}
}
}
WaterQualityReport::create(array_merge($attributes, [
'device_id' => $device->id,
'reported_at' => $start,
]));
}
}
/**
* 创建 linkos 气象设备每日报告
*/