From 845cc533f6573d09133a30c7925b961f4a71b660 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Mon, 26 Feb 2024 11:30:26 +0800 Subject: [PATCH] fixed --- app/api/controller/dataview/DeviceController.php | 2 +- app/common/logic/RemoteRequestLogic.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/api/controller/dataview/DeviceController.php b/app/api/controller/dataview/DeviceController.php index ad4e809..e4c8a06 100644 --- a/app/api/controller/dataview/DeviceController.php +++ b/app/api/controller/dataview/DeviceController.php @@ -96,7 +96,7 @@ class DeviceController extends BaseApiController { $data = [ [ - 'name'=>'4G中转站', + 'name'=>'项圈中转站', 'desc'=>'4G中转站设备', 'icon'=>'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/15fc3202402211610238016.png' ], diff --git a/app/common/logic/RemoteRequestLogic.php b/app/common/logic/RemoteRequestLogic.php index 1db5fa6..892be79 100644 --- a/app/common/logic/RemoteRequestLogic.php +++ b/app/common/logic/RemoteRequestLogic.php @@ -177,6 +177,7 @@ class RemoteRequestLogic extends BaseLogic // 空气温度 ambient_temperature $ambientTemperatureDevice = Device::whereIn('id', $deviceIds)->where('monitor_item', 'ambient_temperature,ambient_humidity')->find(); + $ambientTemperatureDevice['name'] = '温度监测'; if (!empty($ambientTemperatureDevice)) { $rangeData = self::requestRangeMonitorData($ambientTemperatureDevice); if (!empty($rangeData)) { @@ -190,6 +191,7 @@ class RemoteRequestLogic extends BaseLogic // 空气湿度 ambient_humidity $ambientHumidityDevice = Device::whereIn('id', $deviceIds)->where('monitor_item', 'ambient_temperature,ambient_humidity')->find(); + $ambientHumidityDevice['name'] = '湿度监测'; if (!empty($ambientHumidityDevice)) { $rangeData = self::requestRangeMonitorData($ambientHumidityDevice); if (!empty($rangeData)) {