From ee6efe657b0d070ed73825742ddab253e4af699b Mon Sep 17 00:00:00 2001
From: keke <oogff07@gmail.com>
Date: Mon, 24 Jul 2023 15:43:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20BG=20service=20?=
 =?UTF-8?q?=E5=88=A4=E6=96=B7=20=E5=88=A4=E6=96=B7=20history=20=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E8=A9=B2=20device=20(=E6=97=A5=E5=91=A8?=
 =?UTF-8?q?=E6=9C=88=20=E6=AD=B8=E6=AA=94)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
index 0e63e1e..9842dad 100644
--- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
+++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs
@@ -167,6 +167,10 @@ namespace BackendWorkerService.Quartz.Jobs
                                     and device_floor_tag = '{device_number.Split("_")[4]}' and device_master_tag = '{device_number.Split("_")[5]}' 
                                     and device_last_name_tag = '{device_number.Split("_")[6]}' and device_serial_tag = '{device_number.Split("_")[7]}'
                                     and device_point_name = '{device_number.Split("_")[8]}'").Result;
+                                if (string.IsNullOrEmpty(station))
+                                {
+                                    continue;
+                                }
                                 archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint.Replace("$3", "")}/~historyRollup/");
                                 //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/");
                                 archiveRequest.Method = "POST";
@@ -646,6 +650,10 @@ namespace BackendWorkerService.Quartz.Jobs
                                     and device_floor_tag = '{device_number.Split("_")[4]}' and device_master_tag = '{device_number.Split("_")[5]}' 
                                     and device_last_name_tag = '{device_number.Split("_")[6]}' and device_serial_tag = '{device_number.Split("_")[7]}'
                                     and device_point_name = '{device_number.Split("_")[8]}'").Result;
+                                if (string.IsNullOrEmpty(station))
+                                {
+                                    continue;
+                                }
                                 archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint.Replace("$3", "")}/~historyRollup/");
                                 //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/");
                                 archiveRequest.Method = "POST";
@@ -1023,6 +1031,10 @@ namespace BackendWorkerService.Quartz.Jobs
                                     and device_floor_tag = '{device_number.Split("_")[4]}' and device_master_tag = '{device_number.Split("_")[5]}' 
                                     and device_last_name_tag = '{device_number.Split("_")[6]}' and device_serial_tag = '{device_number.Split("_")[7]}'
                                     and device_point_name = '{device_number.Split("_")[8]}'").Result;
+                                if (string.IsNullOrEmpty(station))
+                                {
+                                    continue;
+                                }
                                 archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint.Replace("$3", "")}/~historyRollup/");
                                 //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/");
                                 archiveRequest.Method = "POST";

From d56334f8678ae5ddb21f8307406a47ffa7867caf Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Tue, 25 Jul 2023 12:18:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=AC=8A=E9=99=90=E7=AE=A1=E7=90=86=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=AC=84=E4=BD=8D=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Backend/Views/UserInfo/_RoleAuth.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Backend/Views/UserInfo/_RoleAuth.cshtml b/Backend/Views/UserInfo/_RoleAuth.cshtml
index 0416027..9c9b339 100644
--- a/Backend/Views/UserInfo/_RoleAuth.cshtml
+++ b/Backend/Views/UserInfo/_RoleAuth.cshtml
@@ -23,7 +23,7 @@
                     <th>#</th>
                     <th>角色</th>
                     <th>功能類型</th>
-                    <th>區域</th>
+                    <th>棟別</th>
                     <th>功能名稱</th>
                     <th>功能細項名稱</th>
                     <th>建立時間</th>