From 85ada8e9f3d3a4c0378a5d89c55341a09d7c0b3a Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 19 Dec 2023 14:09:59 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=E6=BA=AF=E6=BA=90=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index a4845ab1..ca6ca230 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -48,25 +48,25 @@ class IndexController extends BaseApiController $data['monitor'] = []; }else{ $data['monitor']['soil_monitor_data'] = [ - 'wind_direction'=>$landCollection['wind_direction'], - 'wind_speed'=>$landCollection['wind_speed'], - 'air_temperature'=>$landCollection['ambient_temperature'], - 'air_moisture'=>$landCollection['ambient_humidity'], - 'co2_content'=>$landCollection['carbon_dioxide'], - 'pressure'=>$landCollection['ambient_air_pressure'], - 'rainfall'=>$landCollection['rainfall'], - 'light_intensity'=>$landCollection['ambient_lighting'], - 'create_time' => $landCollection['create_time'] + 'soil_temperature'=>$landCollection['soil_temperature'], + 'soil_moisture'=>$landCollection['soil_moisture'], + 'conductivity'=>$landCollection['soil_conductivity'], + 'ph'=>$landCollection['soil_PH'], + 'n_content'=>$landCollection['soil_potassium_phosphate_nitrogen'], + 'p_content'=>$landCollection['soil_potassium_phosphate_phosphorus'], + 'k_content'=>$landCollection['soil_potassium_phosphate_potassium'], + 'create_time' => $landCollection['create_time'] ]; $data['monitor']['air_monitor_data'] = [ - 'soil_temperature'=>$landCollection['soil_temperature'], - 'soil_moisture'=>$landCollection['soil_moisture'], - 'conductivity'=>$landCollection['soil_conductivity'], - 'ph'=>$landCollection['soil_PH'], - 'n_content'=>$landCollection['soil_potassium_phosphate_nitrogen'], - 'p_content'=>$landCollection['soil_potassium_phosphate_phosphorus'], - 'k_content'=>$landCollection['soil_potassium_phosphate_potassium'], - 'create_time' => $landCollection['create_time'] + 'wind_direction'=>$landCollection['wind_direction'], + 'wind_speed'=>$landCollection['wind_speed'], + 'air_temperature'=>$landCollection['ambient_temperature'], + 'air_moisture'=>$landCollection['ambient_humidity'], + 'co2_content'=>$landCollection['carbon_dioxide'], + 'pressure'=>$landCollection['ambient_air_pressure'], + 'rainfall'=>$landCollection['rainfall'], + 'light_intensity'=>$landCollection['ambient_lighting'], + 'create_time' => $landCollection['create_time'] ]; } }