From ba6fc268f07157f5f477c6ee308c711d08900c77 Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 22 May 2023 10:09:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9ta?= =?UTF-8?q?ble=E5=95=8F=E9=A1=8C,=20db=E6=96=B0=E5=A2=9Etable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/DeviceManageController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index d84690f..0dc7b34 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -581,8 +581,8 @@ namespace FrontendWebApi.ApiControllers LENGTH(SUBSTRING_INDEX(errmsg, '_', -1) -1) -- 最後一段的長度 -1 -- 減掉最後的 _ ex:D3_B_B1F_CO_ ) device_tag - FROM alarmorion_orionalarmrecord a - JOIN alarmorion_orionalarmfacetvalue b on a.id = b.alarm + FROM alarmOrion_OrionAlarmRecord a + JOIN alarmOrion_OrionAlarmFacetValue b on a.id = b.alarm WHERE a.sourceState = 1 and b.facetName = 9 ) a left join device b on a.device_tag = b.device_number AND b.deleted = 0 From aa61f213544e3a8f2e0a4da1510b2f1d39c70866 Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 22 May 2023 10:19:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9ta?= =?UTF-8?q?ble=20=E5=8F=A6=E5=90=8D=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/RescueDeviceController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FrontendWebApi/ApiControllers/RescueDeviceController.cs b/FrontendWebApi/ApiControllers/RescueDeviceController.cs index ac58c9f..2e9b04c 100644 --- a/FrontendWebApi/ApiControllers/RescueDeviceController.cs +++ b/FrontendWebApi/ApiControllers/RescueDeviceController.cs @@ -88,7 +88,7 @@ namespace FrontendWebApi.ApiControllers try { - var sqlString = @$"select building_tag as Value, full_name as Name from building a where a.deleted = 0 and a.status = 0 ORDER BY A.priority ASC, A.created_at DESC"; + var sqlString = @$"select building_tag as Value, full_name as Name from building a where a.deleted = 0 and a.status = 0 ORDER BY a.priority ASC, a.created_at DESC"; KeyValue = await backendRepository.GetAllAsync(sqlString); apiResult.Code = "0000";