From 31874831f7a57ecc95e29b5604ef1fe868fffed1 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Fri, 21 Oct 2022 15:12:46 +0800 Subject: [PATCH] Update --- .../LinkosDeviceLogArchiveCommand.php | 6 +- ...og.php => MeteorologicalMonitoringLog.php} | 2 +- ...ingHourlyLog.php => SoilMonitoringLog.php} | 2 +- ...yLog.php => WaterQualityMonitoringLog.php} | 2 +- app/Services/LinkosDeviceLogService.php | 159 ++++++++++-------- ...757_create_soil_monitoring_logs_table.php} | 4 +- ..._meteorological_monitoring_logs_table.php} | 4 +- ...e_water_quality_monitoring_logs_table.php} | 4 +- 8 files changed, 99 insertions(+), 84 deletions(-) rename app/Models/{MeteorologicalMonitoringHourlyLog.php => MeteorologicalMonitoringLog.php} (93%) rename app/Models/{SoilMonitoringHourlyLog.php => SoilMonitoringLog.php} (90%) rename app/Models/{WaterQualityMonitoringHourlyLog.php => WaterQualityMonitoringLog.php} (89%) rename database/migrations/{2022_10_20_155757_create_soil_monitoring_hourly_logs_table.php => 2022_10_20_155757_create_soil_monitoring_logs_table.php} (90%) rename database/migrations/{2022_10_20_160027_create_meteorological_monitoring_hourly_logs_table.php => 2022_10_20_160027_create_meteorological_monitoring_logs_table.php} (93%) rename database/migrations/{2022_10_20_160129_create_water_quality_monitoring_hourly_logs_table.php => 2022_10_20_160129_create_water_quality_monitoring_logs_table.php} (89%) diff --git a/app/Console/Commands/LinkosDeviceLogArchiveCommand.php b/app/Console/Commands/LinkosDeviceLogArchiveCommand.php index 127d583..912c770 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->handleSoilMonitoringLog($device, $log->data, $log->reported_at), - DeviceType::WaterQuality => $linkosDeviceLogService->handleWaterQualityMonitoringLog($device, $log->data, $log->reported_at), - DeviceType::Meteorological => $linkosDeviceLogService->handleMeteorologicalMonitoringLog($device, $log->data, $log->reported_at), + DeviceType::Soil => $linkosDeviceLogService->handleSoilDeviceData($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), }; } }); diff --git a/app/Models/MeteorologicalMonitoringHourlyLog.php b/app/Models/MeteorologicalMonitoringLog.php similarity index 93% rename from app/Models/MeteorologicalMonitoringHourlyLog.php rename to app/Models/MeteorologicalMonitoringLog.php index 91bffa8..620bd88 100644 --- a/app/Models/MeteorologicalMonitoringHourlyLog.php +++ b/app/Models/MeteorologicalMonitoringLog.php @@ -6,7 +6,7 @@ use App\Enums\WindDirection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class MeteorologicalMonitoringHourlyLog extends Model +class MeteorologicalMonitoringLog extends Model { use HasFactory; diff --git a/app/Models/SoilMonitoringHourlyLog.php b/app/Models/SoilMonitoringLog.php similarity index 90% rename from app/Models/SoilMonitoringHourlyLog.php rename to app/Models/SoilMonitoringLog.php index b227f56..711da7f 100644 --- a/app/Models/SoilMonitoringHourlyLog.php +++ b/app/Models/SoilMonitoringLog.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class SoilMonitoringHourlyLog extends Model +class SoilMonitoringLog extends Model { use HasFactory; diff --git a/app/Models/WaterQualityMonitoringHourlyLog.php b/app/Models/WaterQualityMonitoringLog.php similarity index 89% rename from app/Models/WaterQualityMonitoringHourlyLog.php rename to app/Models/WaterQualityMonitoringLog.php index 3f0c537..953000d 100644 --- a/app/Models/WaterQualityMonitoringHourlyLog.php +++ b/app/Models/WaterQualityMonitoringLog.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class WaterQualityMonitoringHourlyLog extends Model +class WaterQualityMonitoringLog extends Model { use HasFactory; diff --git a/app/Services/LinkosDeviceLogService.php b/app/Services/LinkosDeviceLogService.php index 8cb5b58..f639efc 100644 --- a/app/Services/LinkosDeviceLogService.php +++ b/app/Services/LinkosDeviceLogService.php @@ -6,14 +6,65 @@ use App\Enums\DeviceType; use App\Exceptions\BizException; use App\Models\Device; use App\Models\LinkosDeviceLog; -use App\Models\MeteorologicalMonitoringHourlyLog; -use App\Models\SoilMonitoringHourlyLog; -use App\Models\WaterQualityMonitoringHourlyLog; +use App\Models\MeteorologicalMonitoringLog; +use App\Models\SoilMonitoringLog; +use App\Models\WaterQualityMonitoringLog; use Carbon\Carbon; use Illuminate\Support\Arr; class LinkosDeviceLogService { + /** + * 土壤监测数据字段 + * + * @var array + */ + protected $soilMonitoringFields = [ + 'conductivity' => 'conductivity', + 'humidity' => 'soil_humidity', + 'temperature' => 'soil_temperature', + 'n' => 'nitrogen_content', + 'p' => 'phosphorus_content', + 'k' => 'potassium_content', + ]; + + /** + * 气象监测数据字段 + * + * @var array + */ + protected $meteorologicalMonitoringFields = [ + 'wind_speed' => 'wind_speed', + 'wind_power' => 'wind_power', + 'wind_direction' => 'wind_direction', + 'wind_degree' => 'wind_degree', + 'air_humidity' => 'box_humidity', + 'air_temperature' => 'box_temperature', + 'air_pressure' => 'box_pressure', + 'co2' => 'box_carbon', + 'noise' => 'box_noise', + 'illumination' => 'box_illumination', + 'accumulated_rainfall' => 'accumulate_rainfall', + 'current_rainfall' => 'current_rainfall', + 'moment_rainfall' => 'moment_rainfall', + 'pm25' => 'pm25_concentration', + 'pm10' => 'pm10_concentration', + ]; + + /** + * 水质监测数据字段 + * + * @var array + */ + protected $waterQualityMonitoringFields = [ + 'conductivity' => 'conductivity', + 'oxygen' => 'oxygen', + 'chlorine' => 'chlorine', + 'turbidity' => 'turbidity', + 'temperature' => 'temp', + 'ph' => 'ph', + ]; + /** * 创建 Linkos 设备数据 * @@ -45,9 +96,9 @@ class LinkosDeviceLogService if ($log->data) { foreach ($devices as $device) { match ($device->type) { - DeviceType::Soil => $this->handleSoilMonitoringLog($device, $log->data, $log->reported_at), - DeviceType::WaterQuality => $this->handleWaterQualityMonitoringLog($device, $log->data, $log->reported_at), - DeviceType::Meteorological => $this->handleMeteorologicalMonitoringLog($device, $log->data, $log->reported_at), + DeviceType::Soil => $this->handleSoilDeviceData($device, $log->data, $log->reported_at), + DeviceType::Meteorological => $this->handleMeteorologicalDeviceData($device, $log->data, $log->reported_at), + DeviceType::WaterQuality => $this->handleWaterQualityDeviceData($device, $log->data, $log->reported_at), }; } } @@ -56,134 +107,98 @@ class LinkosDeviceLogService } /** - * 处理气象监控数据 + * 处理土壤设备数据 * * @param \App\Models\Device $device * @param array $data - * @param \Carbon\Carbon $monitoredAt + * @param \Carbon\Carbon $reportedAt * @return void */ - public function handleMeteorologicalMonitoringLog(Device $device, array $data, Carbon $monitoredAt): void + public function handleSoilDeviceData(Device $device, array $data, Carbon $reportedAt): void { - $attributes = [ - 'wind_speed' => 'wind_speed', - 'wind_power' => 'wind_power', - 'wind_direction' => 'wind_direction', - 'wind_degree' => 'wind_degree', - 'air_humidity' => 'box_humidity', - 'air_temperature' => 'box_temperature', - 'air_pressure' => 'box_pressure', - 'co2' => 'box_carbon', - 'noise' => 'box_noise', - 'illumination' => 'box_illumination', - 'accumulated_rainfall' => 'accumulate_rainfall', - 'current_rainfall' => 'current_rainfall', - 'moment_rainfall' => 'moment_rainfall', - 'pm25' => 'pm25_concentration', - 'pm10' => 'pm10_concentration', - ]; - - if (! Arr::hasAny($data, $attributes)) { + if (! Arr::hasAny($data, $this->soilMonitoringFields)) { return; } - $hourlyLog = MeteorologicalMonitoringHourlyLog::firstOrCreate([ + $log = SoilMonitoringLog::firstOrCreate([ 'device_id' => $device->id, - 'monitored_at' => $monitoredAt->startOfHour(), + 'monitored_at' => $reportedAt->startOfHour(), ], [ 'agricultural_base_id' => $device->agricultural_base_id, ]); - foreach ($attributes as $key => $value) { - if (! array_key_exists($value, $data)) { + foreach ($this->soilMonitoringFields as $attribute => $key) { + if (! array_key_exists($key, $data)) { continue; } - $hourlyLog->{$key} = $data[$value]; + $log->{$attribute} = $data[$key]; } - $hourlyLog->save(); + $log->save(); } /** - * 处理水质监控数据 + * 处理气象设备数据 * * @param \App\Models\Device $device * @param array $data - * @param \Carbon\Carbon $monitoredAt + * @param \Carbon\Carbon $reportedAt * @return void */ - public function handleWaterQualityMonitoringLog(Device $device, array $data, Carbon $monitoredAt): void + public function handleMeteorologicalDeviceData(Device $device, array $data, Carbon $reportedAt): void { - $attributes = [ - 'conductivity' => 'conductivity', - 'oxygen' => 'oxygen', - 'chlorine' => 'chlorine', - 'turbidity' => 'turbidity', - 'temperature' => 'temp', - 'ph' => 'ph', - ]; - - if (! Arr::hasAny($data, $attributes)) { + if (! Arr::hasAny($data, $this->meteorologicalMonitoringFields)) { return; } - $hourlyLog = WaterQualityMonitoringHourlyLog::firstOrCreate([ + $log = MeteorologicalMonitoringLog::firstOrCreate([ 'device_id' => $device->id, - 'monitored_at' => $monitoredAt->startOfHour(), + 'monitored_at' => $reportedAt->startOfHour(), ], [ 'agricultural_base_id' => $device->agricultural_base_id, ]); - foreach ($attributes as $key => $value) { - if (! array_key_exists($value, $data)) { + foreach ($this->meteorologicalMonitoringFields as $attribute => $key) { + if (! array_key_exists($key, $data)) { continue; } - $hourlyLog->{$key} = $data[$value]; + $log->{$attribute} = $data[$key]; } - $hourlyLog->save(); + $log->save(); } /** - * 处理土壤监控数据 + * 处理水质设备数据 * * @param \App\Models\Device $device * @param array $data - * @param \Carbon\Carbon $monitoredAt + * @param \Carbon\Carbon $reportedAt * @return void */ - public function handleSoilMonitoringLog(Device $device, array $data, Carbon $monitoredAt): void + public function handleWaterQualityDeviceData(Device $device, array $data, Carbon $reportedAt): void { - $attributes = [ - 'conductivity' => 'conductivity', - 'humidity' => 'soil_humidity', - 'temperature' => 'soil_temperature', - 'n' => 'nitrogen_content', - 'p' => 'phosphorus_content', - 'k' => 'potassium_content', - ]; - - if (! Arr::hasAny($data, $attributes)) { + if (! Arr::hasAny($data, $this->waterQualityMonitoringFields)) { return; } - $hourlyLog = SoilMonitoringHourlyLog::firstOrCreate([ + $log = WaterQualityMonitoringLog::firstOrCreate([ 'device_id' => $device->id, - 'monitored_at' => $monitoredAt->startOfHour(), + 'monitored_at' => $reportedAt->startOfHour(), ], [ 'agricultural_base_id' => $device->agricultural_base_id, ]); - foreach ($attributes as $key => $value) { - if (! array_key_exists($value, $data)) { + foreach ($this->waterQualityMonitoringFields as $attribute => $key) { + if (! array_key_exists($key, $data)) { continue; } - $hourlyLog->{$key} = $data[$value]; + $log->{$attribute} = $data[$key]; } - $hourlyLog->save(); + $log->save(); } } diff --git a/database/migrations/2022_10_20_155757_create_soil_monitoring_hourly_logs_table.php b/database/migrations/2022_10_20_155757_create_soil_monitoring_logs_table.php similarity index 90% rename from database/migrations/2022_10_20_155757_create_soil_monitoring_hourly_logs_table.php rename to database/migrations/2022_10_20_155757_create_soil_monitoring_logs_table.php index 20e9162..8b72d6a 100644 --- a/database/migrations/2022_10_20_155757_create_soil_monitoring_hourly_logs_table.php +++ b/database/migrations/2022_10_20_155757_create_soil_monitoring_logs_table.php @@ -13,7 +13,7 @@ return new class extends Migration */ public function up() { - Schema::create('soil_monitoring_hourly_logs', function (Blueprint $table) { + Schema::create('soil_monitoring_logs', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('device_id')->comment('设备ID'); $table->unsignedBigInteger('agricultural_base_id')->comment('农业基地ID'); @@ -38,6 +38,6 @@ return new class extends Migration */ public function down() { - Schema::dropIfExists('soil_monitoring_hourly_logs'); + Schema::dropIfExists('soil_monitoring_logs'); } }; diff --git a/database/migrations/2022_10_20_160027_create_meteorological_monitoring_hourly_logs_table.php b/database/migrations/2022_10_20_160027_create_meteorological_monitoring_logs_table.php similarity index 93% rename from database/migrations/2022_10_20_160027_create_meteorological_monitoring_hourly_logs_table.php rename to database/migrations/2022_10_20_160027_create_meteorological_monitoring_logs_table.php index 25eb228..c39265b 100644 --- a/database/migrations/2022_10_20_160027_create_meteorological_monitoring_hourly_logs_table.php +++ b/database/migrations/2022_10_20_160027_create_meteorological_monitoring_logs_table.php @@ -13,7 +13,7 @@ return new class extends Migration */ public function up() { - Schema::create('meteorological_monitoring_hourly_logs', function (Blueprint $table) { + Schema::create('meteorological_monitoring_logs', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('device_id')->comment('设备ID'); $table->unsignedBigInteger('agricultural_base_id')->comment('农业基地ID'); @@ -47,6 +47,6 @@ return new class extends Migration */ public function down() { - Schema::dropIfExists('meteorological_monitoring_hourly_logs'); + Schema::dropIfExists('meteorological_monitoring_logs'); } }; diff --git a/database/migrations/2022_10_20_160129_create_water_quality_monitoring_hourly_logs_table.php b/database/migrations/2022_10_20_160129_create_water_quality_monitoring_logs_table.php similarity index 89% rename from database/migrations/2022_10_20_160129_create_water_quality_monitoring_hourly_logs_table.php rename to database/migrations/2022_10_20_160129_create_water_quality_monitoring_logs_table.php index 9877549..8510797 100644 --- a/database/migrations/2022_10_20_160129_create_water_quality_monitoring_hourly_logs_table.php +++ b/database/migrations/2022_10_20_160129_create_water_quality_monitoring_logs_table.php @@ -13,7 +13,7 @@ return new class extends Migration */ public function up() { - Schema::create('water_quality_monitoring_hourly_logs', function (Blueprint $table) { + Schema::create('water_quality_monitoring_logs', function (Blueprint $table) { $table->id(); $table->unsignedBigInteger('device_id')->comment('设备ID'); $table->unsignedBigInteger('agricultural_base_id')->comment('农业基地ID'); @@ -38,6 +38,6 @@ return new class extends Migration */ public function down() { - Schema::dropIfExists('water_quality_monitoring_hourly_logs'); + Schema::dropIfExists('water_quality_monitoring_logs'); } };