From da9b6f678d3c23d7e0354e8109321e56d7ed353f Mon Sep 17 00:00:00 2001
From: dev02 <dev02@yourteam.tw>
Date: Wed, 17 May 2023 09:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiControllers/HiNetController.cs         |  2 +-
 .../ApiControllers/HistoryController.cs       | 42 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/FrontendWebApi/ApiControllers/HiNetController.cs b/FrontendWebApi/ApiControllers/HiNetController.cs
index c92fe46..6eba35a 100644
--- a/FrontendWebApi/ApiControllers/HiNetController.cs
+++ b/FrontendWebApi/ApiControllers/HiNetController.cs
@@ -120,7 +120,7 @@ namespace FrontendWebApi.ApiControllers
     /// <summary>
     /// HiNet企業簡訊 Hiair .Net Core API
     /// </summary>
-    public class HiNetController : MyBaseApiController<GraphManageController>
+    public class HiNetController : MyBaseApiController<HiNetController>
     {
         private readonly IBackendRepository backendRepository;
         public Socket socket;
diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs
index 289a63c..52199d9 100644
--- a/FrontendWebApi/ApiControllers/HistoryController.cs
+++ b/FrontendWebApi/ApiControllers/HistoryController.cs
@@ -1118,27 +1118,27 @@ namespace FrontendWebApi.ApiControllers
             {
                 //依據被選擇的設備找出相對應資料
                 var sqlDeviceItemInfo = $@"select 
-			                                            b.full_name as building_name,
-			                                            v1.system_key as Main_system_name,
-			                                            v2.system_key as Sub_system_name,
-			                                            temp.device_number,
-			                                            temp.device_name,
-			                                            temp.full_name as item_name,
-			                                            temp.points,
-			                                            temp.unit
-		                                            from (
-			                                            select 
-				                                            di.*,
-				                                            d.device_number,
-				                                            d.full_name as device_name,
-				                                            d.priority
-			                                            from device_item di
-			                                            inner join device d on di.device_building_tag COLLATE utf8mb4_unicode_ci = d.device_building_tag 
-																			    and di.device_system_tag COLLATE utf8mb4_unicode_ci = d.device_system_tag
-																			    and di.device_name_tag COLLATE utf8mb4_unicode_ci = d.device_name_tag
-                                                                                and d.deleted = 0
-			                                            where di.deleted = 0 and di.unit is not null and d.device_number IN @Device_number
-		                                            ) temp
+			                                    b.full_name as building_name,
+			                                    v1.system_key as Main_system_name,
+			                                    v2.system_key as Sub_system_name,
+			                                    temp.device_number,
+			                                    temp.device_name,
+			                                    temp.full_name as item_name,
+			                                    temp.points,
+			                                    temp.unit
+		                                    from (
+			                                    select 
+				                                    di.*,
+				                                    d.device_number,
+				                                    d.full_name as device_name,
+				                                    d.priority
+			                                    from device_item di
+			                                    inner join device d on di.device_building_tag COLLATE utf8mb4_unicode_ci = d.device_building_tag 
+																		and di.device_system_tag COLLATE utf8mb4_unicode_ci = d.device_system_tag
+																		and di.device_name_tag COLLATE utf8mb4_unicode_ci = d.device_name_tag
+                                                                        and d.deleted = 0
+			                                    where di.deleted = 0 and di.unit is not null and d.device_number IN @Device_number
+		                                    ) temp
                                             inner join building b on temp.device_building_tag COLLATE utf8mb4_unicode_ci = b.building_tag and b.deleted = 0
                                             inner join variable v1 on temp.device_system_tag COLLATE utf8mb4_unicode_ci = v1.system_value and v1.deleted = 0 and v1.system_type = 'device_system_category_layer2'
                                             inner join variable v2 on temp.device_name_tag COLLATE utf8mb4_unicode_ci = v2.system_value and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3'