diff --git a/app/Console/Commands/LinkosDeviceLogArchiveCommand.php b/app/Console/Commands/LinkosDeviceLogArchiveCommand.php index 912c770..144fbed 100644 --- a/app/Console/Commands/LinkosDeviceLogArchiveCommand.php +++ b/app/Console/Commands/LinkosDeviceLogArchiveCommand.php @@ -46,9 +46,9 @@ class LinkosDeviceLogArchiveCommand extends Command } match ($device->type) { - DeviceType::Soil => $linkosDeviceLogService->handleSoilDeviceData($device, $log->data, $log->reported_at), + DeviceType::Soil => $linkosDeviceLogService->handleSoilMonitoringLog($device, $log->data, $log->reported_at), DeviceType::Meteorological => $linkosDeviceLogService->handleMeteorologicalDeviceData($device, $log->data, $log->reported_at), - DeviceType::WaterQuality => $linkosDeviceLogService->handleWaterQualityDeviceData($device, $log->data, $log->reported_at), + DeviceType::WaterQuality => $linkosDeviceLogService->handleWaterQualityMonitoringLog($device, $log->data, $log->reported_at), }; } }); diff --git a/app/Models/SoilMonitoringDailyLog.php b/app/Models/SoilMonitoringDailyLog.php new file mode 100644 index 0000000..05b6e0a --- /dev/null +++ b/app/Models/SoilMonitoringDailyLog.php @@ -0,0 +1,27 @@ + 'date', + ]; + + protected $fillable = [ + 'device_id', + 'agricultural_base_id', + 'conductivity', + 'humidity', + 'temperature', + 'n', + 'p', + 'k', + 'monitored_at', + ]; +} diff --git a/app/Models/WaterQualityMonitoringDailyLog.php b/app/Models/WaterQualityMonitoringDailyLog.php index 493361f..8ae8442 100644 --- a/app/Models/WaterQualityMonitoringDailyLog.php +++ b/app/Models/WaterQualityMonitoringDailyLog.php @@ -10,7 +10,7 @@ class WaterQualityMonitoringDailyLog extends Model use HasFactory; protected $casts = [ - 'monitored_at' => 'datetime', + 'monitored_at' => 'date', ]; protected $fillable = [ diff --git a/app/Services/LinkosDeviceLogService.php b/app/Services/LinkosDeviceLogService.php index 6583055..125335d 100644 --- a/app/Services/LinkosDeviceLogService.php +++ b/app/Services/LinkosDeviceLogService.php @@ -7,6 +7,7 @@ use App\Exceptions\BizException; use App\Models\Device; use App\Models\LinkosDeviceLog; use App\Models\MeteorologicalMonitoringLog; +use App\Models\SoilMonitoringDailyLog; use App\Models\SoilMonitoringLog; use App\Models\WaterQualityMonitoringDailyLog; use App\Models\WaterQualityMonitoringLog; @@ -98,6 +99,8 @@ class LinkosDeviceLogService foreach ($devices as $device) { switch ($device->type) { case DeviceType::Soil: + $this->handleSoilMonitoringLog($device, $log->data, $log->reported_at); + $this->handleSoilMonitoringDailyLog($device, $log->reported_at); break; case DeviceType::Meteorological: @@ -115,14 +118,14 @@ class LinkosDeviceLogService } /** - * 处理土壤设备数据 + * 处理土壤监测数据 * * @param \App\Models\Device $device * @param array $data * @param \Carbon\Carbon $reportedAt * @return void */ - public function handleSoilDeviceData(Device $device, array $data, Carbon $reportedAt): void + public function handleSoilMonitoringLog(Device $device, array $data, Carbon $reportedAt): void { if (! Arr::hasAny($data, $this->soilMonitoringFields)) { return; @@ -146,6 +149,55 @@ class LinkosDeviceLogService $log->save(); } + /** + * 按天处理土壤监测数据 + * + * @param \App\Models\Device $device + * @param \Carbon\Carbon $date + * @return void + */ + public function handleSoilMonitoringDailyLog(Device $device, Carbon $date) + { + $logs = SoilMonitoringLog::query() + ->where('device_id', $device->id) + ->whereBetween('monitored_at', [$date->copy()->startOfDay(), $date->copy()->endOfDay()]) + ->oldest('monitored_at') + ->get(); + + if ($logs->isEmpty()) { + return; + } + + $data = []; + + foreach ($logs as $log) { + foreach (['conductivity', 'humidity', 'temperature', 'n', 'p', 'k'] as $key) { + if (! is_null($v = $log->{$key})) { + continue; + } + + $item = $data[$key] ?? ['sum' => 0, 'count' => 0]; + $item['sum'] = bcadd($item['sum'], $v, 2); + $item['count']++; + + $data[$key] = $item; + } + } + + $dailyLog = SoilMonitoringDailyLog::firstOrCreate([ + 'device_id' => $device->id, + 'monitored_at' => $date, + ], [ + 'agricultural_base_id' => $device->agricultural_base_id, + ]); + + foreach ($data as $key => $item) { + $dailyLog->{$key} = round(bcmul($item['sum'], $item['count'], 2), 2); + } + + $dailyLog->save(); + } + /** * 处理气象设备数据 * diff --git a/database/migrations/2022_10_24_114148_create_soil_monitoring_daily_logs_table.php b/database/migrations/2022_10_24_114148_create_soil_monitoring_daily_logs_table.php new file mode 100644 index 0000000..b8d54ff --- /dev/null +++ b/database/migrations/2022_10_24_114148_create_soil_monitoring_daily_logs_table.php @@ -0,0 +1,43 @@ +id(); + $table->unsignedBigInteger('device_id')->comment('设备ID'); + $table->unsignedBigInteger('agricultural_base_id')->comment('农业基地ID'); + $table->decimal('conductivity', 8, 2)->nullable()->comment('电导率 (单位: us/cm)'); + $table->decimal('humidity', 8, 2)->nullable()->comment('湿度 (单位: %RH)'); + $table->decimal('temperature', 8, 2)->nullable()->comment('温度 (单位: ℃)'); + $table->decimal('n', 8, 2)->nullable()->comment('氮 (单位: mg/kg)'); + $table->decimal('p', 8, 2)->nullable()->comment('磷 (单位: mg/kg)'); + $table->decimal('k', 8, 2)->nullable()->comment('钾 (单位: mg/kg)'); + $table->date('monitored_at')->comment('监控日期'); + $table->timestamps(); + + $table->index('agricultural_base_id'); + $table->unique(['device_id', 'monitored_at']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('soil_monitoring_daily_logs'); + } +};