From 7bb23e0679f8a19e7d7a7e73f1de845088a91132 Mon Sep 17 00:00:00 2001
From: wanli <wanli@DEV_V00005>
Date: Mon, 21 Nov 2022 14:46:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[Frontend]=20baja=E8=BC=B8=E5=87=BA?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/js/n4js/alarmbaja.js   | 20 +++++++++++++-------
 Frontend/js/n4js/historybaja.js |  9 ++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index 8244ff9..f277db9 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -30,13 +30,17 @@ function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, i
                         _sourceTmp = (record.get('alarmData').get('sourceName')).toString().split('_');
                         _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
                         _sourceName = _sourceTmp[7] + "-" + _sourceTmp[8];
-                        _ss += ', "' + _index + '": {"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+
+                        if (_index == 0)
+                            _ss += '{"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+                        else
+                            _ss += ',{"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }
@@ -84,7 +88,6 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
                     },
                     after: function () {
                         _result += '{' + '"count": ' + _index + ', "data":[';
-
                         _result += _ss + ']';
                         _result += '}';
                         if (typeof callback === 'function') {
@@ -111,13 +114,16 @@ function getOneSystemAlarmStateByBaja(systemPath, callback) {
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
-                        _ss += ', "' + _index + '": {"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+                        if (_index == 0)
+                            _ss += '{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+                        else
+                            _ss += ',{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }
diff --git a/Frontend/js/n4js/historybaja.js b/Frontend/js/n4js/historybaja.js
index 0464754..3c5bb22 100644
--- a/Frontend/js/n4js/historybaja.js
+++ b/Frontend/js/n4js/historybaja.js
@@ -18,13 +18,16 @@ function getHistoryDataByBaja(devicePath, startDate_millisecond, endDate_millise
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
-                        _ss += ', "' + _index + '": {"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
+                        if (_index == 0)
+                            _ss += '{"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
+                        else
+                            _ss += ',{"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }

From 66e73c7c1c8669bd97fd6b5d8653c30266f37851 Mon Sep 17 00:00:00 2001
From: wanli <wanli@DEV_V00005>
Date: Mon, 21 Nov 2022 14:57:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[Backend]=20=E6=9B=B4=E6=94=B9baja=E8=BC=B8?=
 =?UTF-8?q?=E5=87=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Backend/App_Data/bajaJsList.ods | Bin 17388 -> 16950 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Backend/App_Data/bajaJsList.ods b/Backend/App_Data/bajaJsList.ods
index 8f63b6d2fa772831f961e819723dfad49a99ff97..445e2df48eaf506cde66c944164dc4aa266872b8 100644
GIT binary patch
delta 13168
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
KXcPQH`@aA-X)*Qy

delta 13534
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
ArvLx|


From 6c4b106ef87033bcd9352e514f868c1aedc6cce4 Mon Sep 17 00:00:00 2001
From: dev02 <dev02@yourteam.tw>
Date: Mon, 21 Nov 2022 18:07:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?device=20list=E6=96=B0=E5=A2=9E=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=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 | 5 ++++-
 FrontendWebApi/Models/HistoryClass.cs                   | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index c6a3e65..ad78366 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -61,13 +61,16 @@ namespace FrontendWebApi.ApiControllers
             {
                 var dbsub = await frontendRepository.GetAllAsync<HistoryDBMainSub>(
                     @$"select distinct v1.system_key main_name, v1.system_value main_system_tag, v2.system_key sub_name, v2.system_value sub_system_tag, v1.system_priority, v2.system_priority,
-                                dk.device_normal_color, dk.device_close_color, dk.device_error_color
+                                dk.device_normal_color, dk.device_close_color, dk.device_error_color,
+                                di.full_name as device_item_name, di.points as device_item_points, di.unit as device_item_unit, di.is_show_riserDiagram as device_item_is_show_riserDiagram,
+                                di.is_controll as device_item_is_controll, di.is_bool as device_item_is_bool, di.is_link as device_item_is_link
                         from role_auth a
                         join auth_page b on a.AuthCode = b.AuthCode
                         join userinfo c on c.role_guid = a.role_guid
                         join variable v2 on b.ShowView = v2.id and v2.system_type = @sub_system_type
                         join variable v1 on v1.id = v2.system_parent_id and v1.system_type = @main_system_type
                         left join device_kind dk on v1.system_value = dk.device_system_tag and v2.system_value = dk.device_name_tag and dk.device_building_tag = @building_tag
+                        left join device_item di on v2.system_value = di.device_name_tag and v1.system_value = di.device_system_tag and di.deleted = 0
                         where c.account = @account
                         order by v1.system_priority, v2.system_priority", new { @account = myUser.account, @sub_system_type = sub_system_type, @main_system_type = main_system_type, @building_tag = fd.building_tag });
                 var mains = dbsub.GroupBy(a => a.main_system_tag).ToList();
diff --git a/FrontendWebApi/Models/HistoryClass.cs b/FrontendWebApi/Models/HistoryClass.cs
index 3f3269c..519ea79 100644
--- a/FrontendWebApi/Models/HistoryClass.cs
+++ b/FrontendWebApi/Models/HistoryClass.cs
@@ -62,6 +62,14 @@ namespace FrontendWebApi.Models
         public string device_normal_color { get; set; }
         public string device_close_color { get; set; }
         public string device_error_color { get; set; }
+        public string device_item_name { get; set; }
+        public string device_item_points { get; set; }
+        public string device_item_unit { get; set; }
+        public byte device_item_is_show { get; set; }
+        public byte device_item_is_show_riserDiagram { get; set; }
+        public byte device_item_is_controll { get; set; }
+        public byte device_item_is_bool { get; set; }
+        public byte device_item_is_link { get; set; }
     }
 
     public class BuildingFloorRawData