diff --git a/app/Iot/BiAng/HttpClient.php b/app/Iot/BiAng/HttpClient.php index 9975873..dbde203 100644 --- a/app/Iot/BiAng/HttpClient.php +++ b/app/Iot/BiAng/HttpClient.php @@ -37,7 +37,7 @@ class HttpClient public function getLatestWaterDeviceReport(string $deviceId) { $result = $this->get( - $this->apiUrl('/api/open-api/open/getWaterDeviceData'), + $this->apiUrl('/api/open-api/open/getCurrentWaterData'), [ 'deviceId' => $deviceId, ] diff --git a/app/Services/BiAngDeviceService.php b/app/Services/BiAngDeviceService.php index d848d5f..4a6e2b4 100644 --- a/app/Services/BiAngDeviceService.php +++ b/app/Services/BiAngDeviceService.php @@ -152,9 +152,11 @@ class BiAngDeviceService if (is_array($data = $log->data)) { foreach ($data as $k => $v) { $attribute = match ($k) { - 'ec1' => 'conductivity', - 'waterdo' => 'oxygen', - 'zd' => 'turbidity', + 'waterMlss' => 'turbidity', + 'waterPh' => 'ph', + 'waterDo' => 'oxygen', + 'waterTemp' => 'temperature', + 'waterNh3n' => 'nh3n', default => null, }; @@ -474,6 +476,7 @@ class BiAngDeviceService 'ph' => ['sum' => 0, 'count' => 0], 'temperature' => ['sum' => 0, 'count' => 0], 'turbidity' => ['sum' => 0, 'count' => 0], + 'nh3n' => ['sum' => 0, 'count' => 0], ]; foreach ($waterQualityReports as $waterQualityReport) { diff --git a/database/migrations/2024_05_28_180744_add_nh3n_to_water_quality_monitoring_logs.php b/database/migrations/2024_05_28_180744_add_nh3n_to_water_quality_monitoring_logs.php new file mode 100644 index 0000000..9acb732 --- /dev/null +++ b/database/migrations/2024_05_28_180744_add_nh3n_to_water_quality_monitoring_logs.php @@ -0,0 +1,32 @@ +decimal('nh3n', 8, 2)->nullable()->comment('氨氮 (mg/L)'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('water_quality_monitoring_logs', function (Blueprint $table) { + $table->dropColumn(['nh3n']); + }); + } +}; diff --git a/database/migrations/2024_05_28_180922_add_nh3n_to_water_quality_monitoring_daily_logs.php b/database/migrations/2024_05_28_180922_add_nh3n_to_water_quality_monitoring_daily_logs.php new file mode 100644 index 0000000..7bde438 --- /dev/null +++ b/database/migrations/2024_05_28_180922_add_nh3n_to_water_quality_monitoring_daily_logs.php @@ -0,0 +1,32 @@ +decimal('nh3n', 8, 2)->nullable()->comment('氨氮 (mg/L)'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('water_quality_monitoring_daily_logs', function (Blueprint $table) { + $table->dropColumn(['nh3n']); + }); + } +};