From edba8b60eafce756dab2d46980677dedce4b619d Mon Sep 17 00:00:00 2001 From: dev01 Date: Sat, 31 Dec 2022 15:33:19 +0800 Subject: [PATCH] =?UTF-8?q?[FrontendWebApi]=20DeviceManage=20GetDeviceList?= =?UTF-8?q?=20=E5=8F=96=E5=BE=97=E8=A8=AD=E5=82=99=E6=B8=85=E5=96=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20room=5Fdbid=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/DeviceManageController.cs | 3 ++- FrontendWebApi/Models/Device.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 08eed00..c5afad3 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -278,7 +278,8 @@ namespace FrontendWebApi.ApiControllers sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, d.priority, dk.device_image, d.device_number, CONCAT('{baseURL}', '{deviceKindFilePath}', dk.device_image) AS device_image_url,d.status, dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, dk.device_normal_point_name, dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, dk.device_close_point_name, - dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing, dk.device_error_point_name + dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing, dk.device_error_point_name, + d.room_dbid from device d left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag and d.device_name_tag = dk.device_name_tag diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index c854265..920ff00 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/FrontendWebApi/Models/Device.cs @@ -73,6 +73,7 @@ namespace FrontendWebApi.Models public string device_error_point_name { get; set; } public string device_error_point_value { get; set; } public string device_error_flashing { get; set; } + public string room_dbid { get; set; } public List Device_nodes { get; set; } }