From da004b567497361fcde608a739099c68a21348e1 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Tue, 28 May 2024 18:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E6=98=82=E6=B0=B4=E8=B4=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Iot/BiAng/HttpClient.php                  |  2 +-
 app/Services/BiAngDeviceService.php           |  9 ++++--
 ..._nh3n_to_water_quality_monitoring_logs.php | 32 +++++++++++++++++++
 ...to_water_quality_monitoring_daily_logs.php | 32 +++++++++++++++++++
 4 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 database/migrations/2024_05_28_180744_add_nh3n_to_water_quality_monitoring_logs.php
 create mode 100644 database/migrations/2024_05_28_180922_add_nh3n_to_water_quality_monitoring_daily_logs.php

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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('water_quality_monitoring_logs', function (Blueprint $table) {
+            $table->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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('water_quality_monitoring_daily_logs', function (Blueprint $table) {
+            $table->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']);
+        });
+    }
+};