From 378c166ea9fd3d590b1d407cb963709e929d5178 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Sun, 6 Aug 2023 14:23:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E5=90=91=E5=BA=A6=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/MeteorologicalMonitoringLog.php | 9 +++++++++ app/Services/BiAngDeviceLogService.php | 18 +++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/Models/MeteorologicalMonitoringLog.php b/app/Models/MeteorologicalMonitoringLog.php index 620bd88..6387877 100644 --- a/app/Models/MeteorologicalMonitoringLog.php +++ b/app/Models/MeteorologicalMonitoringLog.php @@ -10,6 +10,15 @@ class MeteorologicalMonitoringLog extends Model { use HasFactory; + const WIND_DIRECTION_NORTH = 0; + const WIND_DIRECTION_NORTHEAST = 1; + const WIND_DIRECTION_EAST = 2; + const WIND_DIRECTION_SOUTHEAST = 3; + const WIND_DIRECTION_SOUTH = 4; + const WIND_DIRECTION_SOUTHWEST = 5; + const WIND_DIRECTION_WEST = 6; + const WIND_DIRECTION_NORTHWEST = 7; + protected $casts = [ 'wind_direction' => WindDirection::class, 'monitored_at' => 'datetime', diff --git a/app/Services/BiAngDeviceLogService.php b/app/Services/BiAngDeviceLogService.php index 8fa38e9..d314a43 100644 --- a/app/Services/BiAngDeviceLogService.php +++ b/app/Services/BiAngDeviceLogService.php @@ -182,23 +182,23 @@ class BiAngDeviceLogService break; case 'wind_degree': - $attributes[$attribute] = value(function ($v) { + $attributes['wind_direction'] = value(function ($v) { if ($v >= 22.5 && $v < 67.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_NORTHEAST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_NORTHEAST; } elseif ($v >= 67.5 && $v < 112.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_EAST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_EAST; } elseif ($v >= 112.5 && $v < 157.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_SOUTHEAST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_SOUTHEAST; } elseif ($v >= 157.5 && $v < 202.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_SOUTH; + return MeteorologicalMonitoringLog::WIND_DIRECTION_SOUTH; } elseif ($v >= 202.5 && $v < 247.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_SOUTHWEST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_SOUTHWEST; } elseif ($v >= 247.5 && $v < 292.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_WEST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_WEST; } elseif ($v >= 292.5 && $v < 337.5) { - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_NORTHWEST; + return MeteorologicalMonitoringLog::WIND_DIRECTION_NORTHWEST; } - return MeteorologicalMonitoringDailyLog::WIND_DIRECTION_NORTH; + return MeteorologicalMonitoringLog::WIND_DIRECTION_NORTH; }, $v); default: $attributes[$attribute] = $v;