From c480e9ef3d5e1a0597e56fcadca92fec09b8f3c4 Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 17 Oct 2022 17:45:27 +0800 Subject: [PATCH 01/14] fix sql --- Backend/Controllers/BuildMenuController.cs | 2 +- Backend/Controllers/DeviceManageController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Backend/Controllers/BuildMenuController.cs b/Backend/Controllers/BuildMenuController.cs index ff1db9e..22bdc87 100644 --- a/Backend/Controllers/BuildMenuController.cs +++ b/Backend/Controllers/BuildMenuController.cs @@ -29,7 +29,7 @@ namespace Backend.Controllers try { - var sqlString = @$"select building_guid 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_guid 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"; diff --git a/Backend/Controllers/DeviceManageController.cs b/Backend/Controllers/DeviceManageController.cs index 701cdbf..00c8da0 100644 --- a/Backend/Controllers/DeviceManageController.cs +++ b/Backend/Controllers/DeviceManageController.cs @@ -179,7 +179,7 @@ namespace Backend.Controllers dk.device_close_flashing, dk.device_error_flashing, (SELECT - STRING_AGG( ISNULL(system_key, ' '), ',') + GROUP_CONCAT( IFNULL(system_key, ' '), ',') FROM device_disaster dd JOIN variable v ON v.deleted = 0 AND v.system_type = 'disaster' AND v.system_value = dd.device_system_value WHERE dd.device_guid = d.device_guid From d4f0add911b4222ca480297e9f13c907ef8d24b2 Mon Sep 17 00:00:00 2001 From: dev02 Date: Tue, 18 Oct 2022 18:22:36 +0800 Subject: [PATCH 02/14] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8D=B2=E5=8F=96table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/DeviceManageController.cs | 61 +++++++++---------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/Backend/Controllers/DeviceManageController.cs b/Backend/Controllers/DeviceManageController.cs index 00c8da0..4325c9a 100644 --- a/Backend/Controllers/DeviceManageController.cs +++ b/Backend/Controllers/DeviceManageController.cs @@ -805,7 +805,7 @@ namespace Backend.Controllers try { - var rawDatas = await backendRepository.GetAllAsync("device_import_ckeck_temp", "is_correct = 1 ORDER BY device_building_tag, device_system_tag, device_floor_tag, device_name_tag"); + var rawDatas = await backendRepository.GetAllAsync("import_niagara_tag", null, null, "device_building_tag, device_system_tag, device_floor_tag, device_name_tag"); var rawDatas_Group_Building_tag = rawDatas.GroupBy(x => x.Device_building_tag).ToList(); List tempFilters = new List(); @@ -871,37 +871,34 @@ namespace Backend.Controllers try { - string sql = @"SELECT - di.device_building_tag, - di.device_system_tag, - di.device_floor_tag, - di.device_name_tag, - di.device_serial_tag, - di.device_number, - di.device_system_category_layer3, - STRING_AGG( ISNULL(v.system_value, ' '), ',') AS Device_disasters, - STRING_AGG( ISNULL(v.system_key, ' '), ',') AS Device_disaster_type_text - FROM - (SELECT - * - FROM device_import_ckeck_temp di - WHERE device_building_tag = @Device_building_tag - AND device_system_tag = @Device_system_tag - AND device_floor_tag = @Device_floor_tag - AND device_name_tag = @Device_name_tag - AND is_correct = 1 - AND device_number NOT IN (SELECT d.device_number FROM device d WHERE d.deleted = 0) - ) di - CROSS APPLY STRING_SPLIT(di.device_disaster, ',') dd - LEFT JOIN variable v ON v.system_type = 'disaster' AND v.system_value = dd.value - GROUP BY di.device_building_tag, - di.device_system_tag, - di.device_floor_tag, - di.device_name_tag, - di.device_serial_tag, - di.device_number, - di.device_system_category_layer3"; - + string sql = @"SELECT + di.device_building_tag, + di.device_system_tag, + di.device_floor_tag, + di.device_last_name_tag as device_name_tag, + di.device_serial_tag, + 0 as device_disaster, + di.niagara_tags as device_number + FROM + ( + SELECT + * + FROM + import_niagara_tag intag + WHERE + device_building_tag = @Device_building_tag + AND device_system_tag = @Device_system_tag + AND device_floor_tag = @Device_floor_tag + AND device_name_tag = @Device_name_tag + AND convert(intag.niagara_tags, nchar) NOT IN ( SELECT convert(d.device_number, nchar) FROM device d WHERE d.deleted = 0 ) + ) di + GROUP BY + di.device_building_tag, + di.device_system_tag, + di.device_floor_tag, + di.device_last_name_tag, + di.device_serial_tag, + di.niagara_tags"; var deviceImports = await backendRepository.GetAllAsync(sql, post); From 240dc6ec25d032f98cf7d87a498768d02a26459b Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 19 Oct 2022 09:41:03 +0800 Subject: [PATCH 03/14] =?UTF-8?q?[=E5=8D=80=E5=9F=9F=E9=81=B8=E5=96=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86]=20=E5=B7=A6=E5=8F=B3=E9=82=8A=E9=A0=90?= =?UTF-8?q?=E8=A8=AD=E9=A0=81=E9=9D=A2=E7=A8=8B=E5=BA=8F=E5=BB=BA=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Views/BuildMenu/Index.cshtml | 407 ++++++++++++++++++--------- Backend/wwwroot/css/site.css | 9 + 2 files changed, 286 insertions(+), 130 deletions(-) diff --git a/Backend/Views/BuildMenu/Index.cshtml b/Backend/Views/BuildMenu/Index.cshtml index 3fabb76..9aee64f 100644 --- a/Backend/Views/BuildMenu/Index.cshtml +++ b/Backend/Views/BuildMenu/Index.cshtml @@ -131,103 +131,246 @@ -
- -
-
- - -
-
- - -
- -
-
-
-
- - -
-
-
- - -
-
- - @*
+ +
+ +
+ +
+ +
- -
- -
+ +
+ + +
+
+ + +
+
+
+
+
+ + +
+
+
+ + +
+
+ + +
+
+ + @*
+
+ + +
+
+ + +
*@ -
-
@@ -147,6 +153,13 @@
+
+
+ + +
+
+
From 73510f6c96b1d579c8a8b837000ada92ac829f94 Mon Sep 17 00:00:00 2001 From: wanli Date: Thu, 20 Oct 2022 17:37:54 +0800 Subject: [PATCH 07/14] =?UTF-8?q?App:=20niagara=E8=88=87device=E5=92=8Cdev?= =?UTF-8?q?ice=5Fitem=E5=81=9A=E5=B0=8D=E6=AF=94=EF=BC=8C=E8=8B=A5?= =?UTF-8?q?=E6=9C=89=E5=B7=AE=E7=95=B0=EF=BC=8C=E5=89=87=E6=9B=B4=E6=96=B0?= =?UTF-8?q?device=E5=92=8Cdevice=5Fitem=20building=5Fmenu=E5=92=8Csub=5Fsy?= =?UTF-8?q?stem=5Ffloor=E5=90=8C=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- z01_WinAPP/Service/procCompare.cs | 338 ++++++++++++++++++------------ z01_WinAPP/fmCheckTagName.cs | 2 +- 2 files changed, 208 insertions(+), 132 deletions(-) diff --git a/z01_WinAPP/Service/procCompare.cs b/z01_WinAPP/Service/procCompare.cs index 6b309fd..3d5045e 100644 --- a/z01_WinAPP/Service/procCompare.cs +++ b/z01_WinAPP/Service/procCompare.cs @@ -26,43 +26,34 @@ namespace tpDomeWinAPP.Service private readonly IBackendRepository backendRepository; - public bool InsertNiagaraTagList(List dt, string building ) + public bool ToInsertNiagaraTagList(List dt, string building ) { bool result = false; //tag + InsertNiagaraTagList(dt, building); + insertItemFromNiagara(dt, building); + deviceComparison(); + deviceItemComparison(); + insertBuildingMenu(); + insertSubSystemFloor(); + return result; + } + + protected void InsertNiagaraTagList(List dt, string building) + { var ds2 = dt.GroupBy(x => new { tag_name2 = x.tag_name - }).Select( x => new device_value2 { + }).Select(x => new device_value2 + { tag_name = x.Key.tag_name2 }); using (MySqlConnection conn = new MySqlConnection(Connection1)) { - //CONCAT('{baseURL}', '{deviceKindFilePath}', dk.device_image) AS device_image_url, conn.Open(); #region 不存在就 Create table - //string ss = @"IF (not EXISTS (SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'import_niagara_tag')) - // BEGIN - - // CREATE TABLE [dbo].[import_niagara_tag]( - // [id] [int] IDENTITY(1,1) NOT NULL, - // [db_tags] [varchar](50) NULL, - // [niagara_tags] [varchar](50) NULL, - // [building] [varchar](10) NULL, - // [system_code1] [varchar](10) NULL, - // [floor] [varchar](10) NULL, - // [system_code2] [varchar](10) NULL, - // [device_serial] [varchar](10) NULL, - // [atDateTime] [smalldatetime] NULL, - // CONSTRAINT [PK_import_niagara_tag] PRIMARY KEY CLUSTERED - // ( - // [id] ASC - // )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] - // ) ON [PRIMARY]; - // END" ; - string ss = @" CREATE TABLE IF NOT EXISTS `import_niagara_tag` ( `id` int(11) NOT NULL AUTO_INCREMENT, `db_tags` varchar(50) DEFAULT NULL, @@ -81,7 +72,6 @@ namespace tpDomeWinAPP.Service ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"; conn.Execute(ss.ToString()); ss = "delete from import_niagara_tag where device_building_tag = '" + building + "'"; - //string ss = "delete from device where device_building_tag = '" + building + "'"; conn.Execute(ss.ToString()); #endregion @@ -104,19 +94,6 @@ namespace tpDomeWinAPP.Service arrTag[6] + "', '" + arrTag[7] + "', " + "now());"); - - //sb.Append($@" insert device(device_number, device_guid, deleted, status, priority, device_system_category_layer3, device_area_tag, device_building_tag, device_system_tag, - // device_name_tag, device_floor_tag, device_master, device_last_name, device_serial_tag, created_at, updated_at) values('" + - // row.tag_name + "', uuid(), 0, 1, 0, '" + - // arrTag[0] + "', '" + - // arrTag[1] + "', '" + - // arrTag[2] + "', '" + - // arrTag[3] + "', '" + - // arrTag[4] + "', '" + - // arrTag[5] + "', '" + - // arrTag[6] + "', '" + - // arrTag[7] + "', " + - // "now(), now());"); } try { @@ -130,18 +107,16 @@ namespace tpDomeWinAPP.Service { throw ex; } - insertItemFromNiagara(dt, conn, building); - deviceComparison(); - deviceItemComparison(); } - - return result; } - protected void insertItemFromNiagara(List dt, MySqlConnection conn, string building) + protected void insertItemFromNiagara(List dt, string building) { - #region create table - string ss = @"CREATE TABLE IF NOT EXISTS `import_niagara_item` ( + using (MySqlConnection conn = new MySqlConnection(Connection1)) + { + conn.Open(); + #region create table + string ss = @"CREATE TABLE IF NOT EXISTS `import_niagara_item` ( `id` int(11) NOT NULL AUTO_INCREMENT, `device_area_tag` varchar(50) DEFAULT NULL, `device_building_tag` varchar(50) DEFAULT NULL, @@ -151,89 +126,81 @@ namespace tpDomeWinAPP.Service `check_status` varchar(50) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;"; - conn.Execute(ss.ToString()); - ss = "delete from import_niagara_item where device_building_tag = '" + building + "'"; - conn.Execute(ss.ToString()); - #endregion - - List dt_item = new List(); - - foreach (var row in dt) - { - if (string.IsNullOrEmpty(row.tag_name)) continue; - string[] arrTag = row.tag_name.Split('_'); - - #region for item - device_item8 row_item = new device_item8(); - row_item.tag_name = row.tag_name; - row_item.device_area_tag = arrTag[0]; - row_item.device_building_tag = arrTag[1]; - row_item.device_system_tag = arrTag[2]; - row_item.device_name_tag = arrTag[3]; - row_item.device_floor_tag = arrTag[4]; - row_item.device_master_tag = arrTag[5]; - row_item.device_last_name_tag = arrTag[6]; - row_item.device_serial_tag = arrTag[7]; - row_item.point_name = row.point_name; - dt_item.Add(row_item); + conn.Execute(ss.ToString()); + ss = "delete from import_niagara_item where device_building_tag = '" + building + "'"; + conn.Execute(ss.ToString()); #endregion - } - //device_item - var ds2_item = dt_item.GroupBy(x => new - { - device_area_tag2 = x.device_area_tag, - device_building_tag2 = x.device_building_tag, - device_system_tag2 = x.device_system_tag, - device_name_tag2 = x.device_name_tag, - point_name2 = x.point_name - }).Select(x => new device_item8 - { - device_area_tag = x.Key.device_area_tag2, - device_building_tag = x.Key.device_building_tag2, - device_system_tag = x.Key.device_system_tag2, - device_name_tag = x.Key.device_name_tag2, - point_name = x.Key.point_name2 - }); + List dt_item = new List(); - StringBuilder sb = new StringBuilder(); - foreach (var row2 in ds2_item) - { - sb.Append($@" insert import_niagara_item(device_area_tag, device_building_tag, device_system_tag, device_name_tag, device_point_name) - values('" + - row2.device_area_tag + "', '" + - row2.device_building_tag + "', '" + - row2.device_system_tag + "', '" + - row2.device_name_tag + "', '" + - row2.point_name + "'" + - ");"); - //var isControll = 0; - //var isBool = 0; - //if(row2.point_name == "ER" || row2.point_name == "AL" || row2.point_name == "ST") - //{ - // isControll = 1; - //} - //if(row2.point_name == "ER" || row2.point_name == "ST") - //{ - // isBool = 1; - //} - //sb.Append($@" insert device_item(deleted, points, is_show, is_show_riserDiagram, is_controll, is_bool, created_at, updated_at) - // values('0, " + row2.point_name + "', 1, 0," + isControll + "," + isBool + ", now(), now();"); - } - try - { - if (sb.Length > 0) + foreach (var row in dt) { - conn.Execute(sb.ToString()); - sb.Clear(); + if (string.IsNullOrEmpty(row.tag_name)) continue; + string[] arrTag = row.tag_name.Split('_'); + + #region for item + device_item8 row_item = new device_item8(); + row_item.tag_name = row.tag_name; + row_item.device_area_tag = arrTag[0]; + row_item.device_building_tag = arrTag[1]; + row_item.device_system_tag = arrTag[2]; + row_item.device_name_tag = arrTag[3]; + row_item.device_floor_tag = arrTag[4]; + row_item.device_master_tag = arrTag[5]; + row_item.device_last_name_tag = arrTag[6]; + row_item.device_serial_tag = arrTag[7]; + row_item.point_name = row.point_name; + dt_item.Add(row_item); + #endregion + } + + //device_item + var ds2_item = dt_item.GroupBy(x => new + { + device_area_tag2 = x.device_area_tag, + device_building_tag2 = x.device_building_tag, + device_system_tag2 = x.device_system_tag, + device_name_tag2 = x.device_name_tag, + point_name2 = x.point_name + }).Select(x => new device_item8 + { + device_area_tag = x.Key.device_area_tag2, + device_building_tag = x.Key.device_building_tag2, + device_system_tag = x.Key.device_system_tag2, + device_name_tag = x.Key.device_name_tag2, + point_name = x.Key.point_name2 + }); + + StringBuilder sb = new StringBuilder(); + foreach (var row2 in ds2_item) + { + sb.Append($@" insert import_niagara_item(device_area_tag, device_building_tag, device_system_tag, device_name_tag, device_point_name) + values('" + + row2.device_area_tag + "', '" + + row2.device_building_tag + "', '" + + row2.device_system_tag + "', '" + + row2.device_name_tag + "', '" + + row2.point_name + "'" + + ");"); + } + try + { + if (sb.Length > 0) + { + conn.Execute(sb.ToString()); + sb.Clear(); + } + } + catch (Exception ex) + { + throw ex; } - } - catch (Exception ex) - { - throw ex; } } + /// + /// 比對device和import_Niagara_tag，並更新至device(資料表) + /// public void deviceComparison() { using (MySqlConnection conn = new MySqlConnection(Connection1)) @@ -258,8 +225,8 @@ namespace tpDomeWinAPP.Service sb.Append($@" insert device(device_guid, deleted, status, priority, is_link, device_area_tag, device_building_tag, device_system_tag, device_name_tag, device_floor_tag, device_master, device_last_name, device_serial_tag, device_number, device_system_category_layer3, created_at, updated_at) - values(uuid(), 0, 1, 0, 1, '" + //device_guid - data.device_area_tag + "', '" + // + values(uuid(), 0, 1, 0, 1, '" + + data.device_area_tag + "', '" + data.device_building_tag + "', '" + data.device_system_tag + "', '" + data.device_name_tag + "', '" + @@ -268,7 +235,7 @@ namespace tpDomeWinAPP.Service data.device_master_tag + "', '" + data.device_last_name_tag + "', '" + data.device_serial_tag + "', '" + - data.niagara_tags + "', '" + //device_number + data.niagara_tags + "', '" + data.device_system_tag + "', now(), now() );"); } if(sb.Length > 0) @@ -288,6 +255,9 @@ namespace tpDomeWinAPP.Service } } + /// + /// 比對device_item和import_Niagara_item，並更新至device_item(資料表) + /// public void deviceItemComparison() { using (MySqlConnection conn = new MySqlConnection(Connection1)) @@ -299,8 +269,7 @@ namespace tpDomeWinAPP.Service sb.Append($@" SELECT m.* FROM import_niagara_item m LEFT JOIN device_item d - ON m.device_area_tag = d.device_area_tag and m.device_building_tag = d.device_building_tag - and m.device_system_tag = d.device_system_tag and m.device_name_tag = d.device_name_tag and m.device_point_name = d.points + ON m.device_system_tag = d.device_system_tag and m.device_name_tag = d.device_name_tag and m.device_point_name = d.points WHERE d.points IS NULL"); result = conn.Query(sb.ToString()).ToList(); sb.Clear(); @@ -319,14 +288,12 @@ namespace tpDomeWinAPP.Service { isBool = 1; } - sb.Append($@"insert device_item(deleted, points, is_show, is_show_riserDiagram, is_controll, is_bool, is_link, device_area_tag, - device_building_tag, device_system_tag, device_name_tag, created_at, updated_at) + sb.Append($@"insert device_item(deleted, points, is_show, is_show_riserDiagram, is_controll, is_bool, is_link, + device_system_tag, device_name_tag, created_at, updated_at) VALUES (0, '" + data.device_point_name + "', 1, 0, " + isControll + "," + isBool + ", 1, '" + - data.device_area_tag + "', '" + - data.device_building_tag + "', '" + data.device_system_tag + "', '" + data.device_name_tag + "', " + "now(), now());"); @@ -340,11 +307,120 @@ namespace tpDomeWinAPP.Service //device有，niagara沒有，is_link 更新成 0 sb.Append($@" SET SQL_SAFE_UPDATES = 0; UPDATE device_item d LEFT JOIN import_niagara_item m - ON d.device_area_tag = m.device_area_tag and d.device_building_tag = m.device_building_tag - and d.device_system_tag = m.device_system_tag and d.device_name_tag = m.device_name_tag and d.points = m.device_point_name + ON d.device_system_tag = m.device_system_tag and d.device_name_tag = m.device_name_tag and d.points = m.device_point_name SET d.is_link = 0 WHERE m.device_point_name IS NULL"); conn.Execute(sb.ToString()); + } + } + + public void insertBuildingMenu() + { + using (MySqlConnection conn = new MySqlConnection(Connection1)) + { + conn.Open(); + List result; + StringBuilder sb = new StringBuilder(); + #region comparison building_menu and import_niagara_tag + sb.Append($@" select a.* from ( + select device_building_tag, device_system_tag, device_name_tag + from import_niagara_tag + group by device_building_tag, device_system_tag, device_name_tag + ) AS a + LEFT JOIN building_menu b + ON a.device_building_tag = b.device_building_tag and a.device_system_tag = b.device_system_tag and a.device_name_tag = b.sub_system_tag + WHERE b.device_building_tag IS NULL"); + result = conn.Query(sb.ToString()).ToList(); + #endregion + sb.Clear(); + + if (result.Count > 0) + { + foreach (var data in result) { + #region insert building_menu + sb.Append(@"insert building_menu(building_tag, main_system_tag, sub_system_tag, device_building_tag, device_system_tag, + is_link, created_by, created_at, updated_by, updated_at) + VALUES ('" + data.device_building_tag + "', '" + + data.device_system_tag + "', '" + + data.device_name_tag + "', '" + + data.device_building_tag + "', '" + + data.device_system_tag + "', " + + "1, 'B43E3CA7-96DD-4FC7-B6E6-974ACC3B0878', now(), 'B43E3CA7-96DD-4FC7-B6E6-974ACC3B0878', now() );"); + #endregion + } + if (sb.Length > 0) + { + conn.Execute(sb.ToString()); + sb.Clear(); + } + } + //building_menu有，import_niagara_tag沒有，is_link 更新成 0 + sb.Append($@" SET SQL_SAFE_UPDATES = 0; + UPDATE building_menu b LEFT JOIN ( + select device_building_tag, device_system_tag, device_name_tag + from import_niagara_tag + group by device_building_tag, device_system_tag, device_name_tag + ) AS a ON b.device_building_tag = a.device_building_tag + and a.device_system_tag = b.device_system_tag and a.device_name_tag = b.sub_system_tag + SET b.is_link = 0 + WHERE b.device_building_tag IS NULL"); + conn.Execute(sb.ToString()); + } + } + + public void insertSubSystemFloor() + { + using (MySqlConnection conn = new MySqlConnection(Connection1)) + { + conn.Open(); + List result; + StringBuilder sb = new StringBuilder(); + #region comparison sub_system_floor and import_niagara_tag + sb.Append($@" select a.* from ( + select device_building_tag, device_system_tag, device_name_tag, device_floor_tag + from import_niagara_tag + group by device_building_tag, device_system_tag, device_name_tag, device_floor_tag + ) AS a + LEFT JOIN sub_system_floor b + ON a.device_building_tag = b.building_tag and a.device_system_tag = b.main_system_tag and a.device_name_tag = b.sub_system_tag and a.device_floor_tag = b.floor_tag + WHERE b.building_tag IS NULL"); + result = conn.Query(sb.ToString()).ToList(); + #endregion + sb.Clear(); + + + if(result.Count > 0) + { + foreach(var data in result) + { + #region insert building_menu + sb.Append(@"insert sub_system_floor(building_tag, main_system_tag, sub_system_tag, floor_tag, + is_link, created_by, created_at, updated_by, updated_at) + VALUES ('" + + data.device_building_tag + "', '" + + data.device_system_tag + "', '" + + data.device_name_tag + "', '" + + data.device_floor_tag + "', " + + "1, 'B43E3CA7-96DD-4FC7-B6E6-974ACC3B0878', now(), 'B43E3CA7-96DD-4FC7-B6E6-974ACC3B0878', now());"); + #endregion + } + if (sb.Length > 0) + { + conn.Execute(sb.ToString()); + sb.Clear(); + } + } + //building_menu有，import_niagara_tag沒有，is_link 更新成 0 + sb.Append($@" SET SQL_SAFE_UPDATES = 0; + UPDATE sub_system_floor b LEFT JOIN ( + select device_building_tag, device_system_tag, device_name_tag, device_floor_tag + from import_niagara_tag + group by device_building_tag, device_system_tag, device_name_tag, device_floor_tag + ) AS a ON b.building_tag = a.device_building_tag + and b.main_system_tag = a.device_system_tag and b.sub_system_tag = a.device_name_tag and b.floor_tag = a.device_floor_tag + SET b.is_link = 0 + WHERE b.building_tag IS NULL"); + conn.Execute(sb.ToString()); } } diff --git a/z01_WinAPP/fmCheckTagName.cs b/z01_WinAPP/fmCheckTagName.cs index 959440e..4691256 100644 --- a/z01_WinAPP/fmCheckTagName.cs +++ b/z01_WinAPP/fmCheckTagName.cs @@ -141,7 +141,7 @@ namespace tpDomeWinAPP if (ds != null && ds.Count > 0) { - svcCompare.InsertNiagaraTagList(ds, building); + svcCompare.ToInsertNiagaraTagList(ds, building); lbMsg2.Text = "Done!" + Environment.NewLine + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); } else From abf63105ef75f83c9748fb204503ecd76c16d719 Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 20 Oct 2022 23:27:00 +0800 Subject: [PATCH 08/14] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=80=E5=9F=9F=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/BuildInfoController.cs | 229 +++++++++--------- Backend/Models/BuildModel.cs | 2 + Backend/Views/BuildInfo/Index.cshtml | 44 +++- Backend/Views/BuildInfo/_BuildInfo.cshtml | 4 + .../be95566e-860e-48cb-af54-9f98218663b9.svg | 5 + 5 files changed, 167 insertions(+), 117 deletions(-) create mode 100644 Backend/wwwroot/upload/floor_map/be95566e-860e-48cb-af54-9f98218663b9.svg diff --git a/Backend/Controllers/BuildInfoController.cs b/Backend/Controllers/BuildInfoController.cs index ac19472..f4e4265 100644 --- a/Backend/Controllers/BuildInfoController.cs +++ b/Backend/Controllers/BuildInfoController.cs @@ -19,6 +19,8 @@ namespace Backend.Controllers { private readonly IBackendRepository backendRepository; private string mapFileSaveAsPath = ""; + private string main_system_name = "device_system_category_layer2"; + private string sub_system_name = "device_system_category_layer1"; public BuildInfoController(IBackendRepository backendRepository) { @@ -44,7 +46,7 @@ namespace Backend.Controllers try { - var sqlString = @$"SELECT A.priority, A.building_guid, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_guid = A.building_guid) AS 'floorNum', A.created_at + var sqlString = @$"SELECT A.priority, A.building_tag, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_tag = A.building_tag) AS 'floorNum', A.created_at FROM building A WHERE A.deleted = 0 ORDER BY A.priority ASC, A.created_at DESC"; @@ -78,8 +80,8 @@ namespace Backend.Controllers //判斷監控主機IP是否重複 var judgeIPAddressRepeat = true; - var sWhere = $@"deleted = 0 AND ip_address = @ip_address AND ip_port = @ip_port AND building_guid != @building_guid"; - var buildInfos = await backendRepository.GetAllAsync("building", sWhere, new { ip_address = post.Ip_address, ip_port = post.Ip_port, building_guid = post.Building_guid }); + var sWhere = $@"deleted = 0 AND ip_address = @ip_address AND ip_port = @ip_port AND building_tag != @building_tag"; + var buildInfos = await backendRepository.GetAllAsync("building", sWhere, new { ip_address = post.Ip_address, ip_port = post.Ip_port, building_tag = post.building_tag }); if (buildInfos.Count == 0) { judgeIPAddressRepeat = false; @@ -87,46 +89,92 @@ namespace Backend.Controllers if (!judgeIPAddressRepeat) { + //Check for duplicate building tag + sWhere = $@"deleted = 0 AND building_tag = @Building_tag"; + buildInfos = await backendRepository.GetAllAsync("building", sWhere, new { building_tag = post.building_tag }); + + if (buildInfos.Count > 0) + { + apiResult.Code = "0002"; + apiResult.Msg = "區域代號不可重複"; + return apiResult; + } + //新增 - if (post.Building_guid == "0") + //抓取當前的Priority + var current_priority = await backendRepository.GetCurrentPriority("building"); + + Dictionary building = new Dictionary(); + building = new Dictionary() { - //產生一組GUID - var guid = Guid.NewGuid(); //大樓GUID + { "@building_tag", post.building_tag}, + { "@full_name", post.Full_name}, + { "@ip_address", post.Ip_address}, + { "@ip_port", post.Ip_port}, + { "@priority", current_priority + 1}, + { "@created_by", myUserInfo.Userinfo_guid} + }; + await backendRepository.AddOneByCustomTable(building, "building"); - //抓取當前的Priority - var current_priority = await backendRepository.GetCurrentPriority("building"); + apiResult.Code = "0000"; + apiResult.Msg = "新增成功"; + } + else + { + apiResult.Code = "0001"; + apiResult.Msg = "監控主機IP不可重複"; + } - Dictionary building = new Dictionary(); - building = new Dictionary() - { - { "@building_guid", guid}, - { "@full_name", post.Full_name}, - { "@ip_address", post.Ip_address}, - { "@ip_port", post.Ip_port}, - { "@priority", current_priority + 1}, - { "@created_by", myUserInfo.Userinfo_guid} - }; - await backendRepository.AddOneByCustomTable(building, "building"); + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = "系統內部錯誤，請聯絡管理者。"; + string json = System.Text.Json.JsonSerializer.Serialize(post); + Logger.LogError("【" + controllerName + "/" + actionName + "】" + json); + Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); + } - apiResult.Code = "0000"; - apiResult.Msg = "新增成功"; - } - else //修改 + return apiResult; + } + + /// + /// 新增 / 修改 區域基本資料 + /// + /// + /// + [HttpPost] + public async Task> EditBuildInfo(BuildInfo post) + { + ApiResult apiResult = new ApiResult(); + + try + { + //判斷監控主機IP是否重複 + var judgeIPAddressRepeat = true; + + var sWhere = $@"deleted = 0 AND ip_address = @ip_address AND ip_port = @ip_port AND building_tag != @building_tag"; + var buildInfos = await backendRepository.GetAllAsync("building", sWhere, new { ip_address = post.Ip_address, ip_port = post.Ip_port, building_tag = post.building_tag }); + if (buildInfos.Count == 0) + { + judgeIPAddressRepeat = false; + } + + if (!judgeIPAddressRepeat) + { + Dictionary building = new Dictionary(); + building = new Dictionary() { - Dictionary building = new Dictionary(); - building = new Dictionary() - { - { "@full_name", post.Full_name}, - { "@ip_address", post.Ip_address}, - { "@ip_port", post.Ip_port}, - { "@updated_by", myUserInfo.Userinfo_guid}, - { "@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} - }; - await backendRepository.UpdateOneByCustomTable(building, "building", "building_guid='" + post.Building_guid + "'"); + { "@full_name", post.Full_name}, + { "@ip_address", post.Ip_address}, + { "@ip_port", post.Ip_port}, + { "@updated_by", myUserInfo.Userinfo_guid}, + { "@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} + }; + await backendRepository.UpdateOneByCustomTable(building, "building", "building_tag='" + post.building_tag + "'"); - apiResult.Code = "0000"; - apiResult.Msg = "修改成功"; - } + apiResult.Code = "0000"; + apiResult.Msg = "修改成功"; } else { @@ -148,14 +196,14 @@ namespace Backend.Controllers } [HttpPost] - public async Task> DeleteOneBuild(string guid) + public async Task> DeleteOneBuild(string tag) { var apiResult = new ApiResult(); try { - string sWhere = @$"deleted = @Deleted AND building_guid = @Guid"; + string sWhere = @$"deleted = @Deleted AND building_tag = @Tag"; - object param = new { Deleted = 0, Guid = guid }; + object param = new { Deleted = 0, Tag = tag }; var buildInfo = await backendRepository.GetOneAsync("building", sWhere, param); @@ -167,8 +215,8 @@ namespace Backend.Controllers } //檢查是否有未刪除的區域選單 - var sbuildMenuWhere = $@"building_guid = @Guid"; - var buildMenus = await backendRepository.GetAllAsync("building_menu", sbuildMenuWhere, new { Guid = guid }); + var sbuildMenuWhere = $@"building_tag = @Tag"; + var buildMenus = await backendRepository.GetAllAsync("building_menu", sbuildMenuWhere, new { Tag = tag }); if (buildMenus.Count > 0) { @@ -178,8 +226,8 @@ namespace Backend.Controllers } //檢查底下是否有未刪除的樓層 - var sfloorWhere = $@"deleted = 0 AND building_guid = @Guid"; - var floors = await backendRepository.GetAllAsync("floor", sfloorWhere, new { Guid = guid }); + var sfloorWhere = $@"deleted = 0 AND building_tag = @tag"; + var floors = await backendRepository.GetAllAsync("floor", sfloorWhere, new { Tag = tag }); if (floors.Count > 0) { @@ -189,7 +237,7 @@ namespace Backend.Controllers return apiResult; } - await backendRepository.DeleteOne(guid, "building", "building_guid"); + await backendRepository.DeleteOne(tag, "building", "building_tag"); apiResult.Code = "0000"; apiResult.Msg = "刪除成功"; @@ -199,7 +247,7 @@ namespace Backend.Controllers { apiResult.Code = "9999"; apiResult.Msg = "系統內部錯誤，請聯絡管理者。"; - Logger.LogError("【" + controllerName + "/" + actionName + "】" + "building_guid=" + guid); + Logger.LogError("【" + controllerName + "/" + actionName + "】" + "building_tag=" + tag); Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); } return apiResult; @@ -223,7 +271,7 @@ namespace Backend.Controllers Dictionary building_priority_dic = new Dictionary(); building_priority_dic = new Dictionary() { - { "building_guid", building_priority.Building_guid}, + { "building_tag", building_priority.Building_tag}, { "@priority", building_priority.Priority}, { "@updated_by", myUserInfo.Userinfo_guid}, { "@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} @@ -232,14 +280,9 @@ namespace Backend.Controllers building_priorities.Add(building_priority_dic); } - var sql = $@"UPDATE building SET priority = @priority, updated_by = @updated_by, updated_at=@updated_at WHERE building_guid = @building_guid"; + var sql = $@"UPDATE building SET priority = @priority, updated_by = @updated_by, updated_at=@updated_at WHERE building_tag = @building_tag"; await backendRepository.ExecuteSql(sql, building_priorities); - - #region 新增至派送資料表 - await backendRepository.ManualInsertBackgroundServiceTask("", "", "building", "update_list", building_priorities); - #endregion - } apiResult.Code = "0000"; @@ -261,7 +304,7 @@ namespace Backend.Controllers /// /// [HttpPost] - public async Task>> BuildFloorList(string BuildGuid) + public async Task>> BuildFloorList(string build_tag) { ApiResult> apiResult = new ApiResult>(); List buildInfo = new List(); @@ -271,9 +314,9 @@ namespace Backend.Controllers var sqlString = @$"SELECT A.floor_guid, A.full_name, InitMapName + '.svg' AS 'initMapName', A.priority, A.created_at FROM floor A WHERE deleted = @deleted - AND A.building_guid = @building_guid + AND A.building_tag = @building_tag ORDER BY A.priority ASC"; - buildInfo = await backendRepository.GetAllAsync(sqlString, new { deleted = 0, building_guid = BuildGuid }); + buildInfo = await backendRepository.GetAllAsync(sqlString, new { deleted = 0, building_tag = build_tag }); apiResult.Code = "0000"; apiResult.Data = buildInfo; @@ -348,13 +391,13 @@ namespace Backend.Controllers var floor_map_guid = Guid.NewGuid(); //抓取當前的Priority - var current_priority = await backendRepository.GetCurrentPriority("floor", "deleted = 0 AND building_guid = '" + post.Building_guid + "'"); + var current_priority = await backendRepository.GetCurrentPriority("floor", "deleted = 0 AND building_tag = '" + post.Building_tag + "'"); Dictionary floor = new Dictionary(); floor = new Dictionary() { { "@floor_guid", guid}, - { "@building_guid", post.Building_guid}, + { "@building_tag", post.Building_tag}, { "@full_name", post.Full_name}, { "@InitMapName", post.InitMapName}, { "@floor_map_name", floor_map_guid}, @@ -374,27 +417,7 @@ namespace Backend.Controllers { post.MapFile.CopyTo(stream); } - } - - #region 新增至派送資料表 - List fileInfos = new List(); - if (post.MapFile != null) - { - var split = post.MapFile.FileName.Split("."); - var fileName = floor_map_guid + "." + split[split.Length - 1]; - - var fullPath = Path.Combine(mapFileSaveAsPath, fileName); - - Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo(); - fileInfo.Folder = "floor_map"; - fileInfo.OriginalFileName = null; - fileInfo.FileName = fileName; - fileInfo.File = fullPath; - - fileInfos.Add(fileInfo); - await backendRepository.ManualInsertFileBackgroundServiceTask("", post.Building_guid, "floor", fileInfos); - } - #endregion + } apiResult.Code = "0000"; apiResult.Msg = "新增成功"; @@ -436,26 +459,6 @@ namespace Backend.Controllers } } - #region 新增至派送資料表 - List fileInfos = new List(); - if (post.MapFile != null) - { - var split = post.MapFile.FileName.Split("."); - var fileName = floor_map_guid + "." + split[split.Length - 1]; - - var fullPath = Path.Combine(mapFileSaveAsPath, fileName); - - Repository.Models.FileInfo fileInfo = new Repository.Models.FileInfo(); - fileInfo.Folder = "floor_map"; - fileInfo.OriginalFileName = buildFloor.Floor_map_name + ".svg"; - fileInfo.FileName = fileName; - fileInfo.File = fullPath; - - fileInfos.Add(fileInfo); - } - await backendRepository.ManualInsertFileBackgroundServiceTask("", post.Building_guid, "floor", fileInfos); - #endregion - apiResult.Code = "0000"; apiResult.Msg = "修改成功"; } @@ -502,10 +505,6 @@ namespace Backend.Controllers var sql = $@"UPDATE floor SET priority = @priority, updated_by = @updated_by, updated_at=@updated_at WHERE floor_guid = @floor_guid"; await backendRepository.ExecuteSql(sql, floor_priorities); - - #region 新增至派送資料表 - await backendRepository.ManualInsertBackgroundServiceTask("", "", "floor", "update_list", floor_priorities); - #endregion } apiResult.Code = "0000"; @@ -547,20 +546,20 @@ namespace Backend.Controllers //判斷區域選單是否還有使用該樓層 var sub_system_where = $@"SELECT - CONCAT(b.full_name, ' - ', ms.full_name, ' - ', ss.full_name) - FROM ( - SELECT - ssf.building_guid, - ssf.main_system_guid, - ssf.sub_system_guid - FROM sub_system_floor ssf - WHERE ssf.deleted = 0 AND floor_guid = @Guid - ) ssf - LEFT JOIN building b ON ssf.building_guid = b.building_guid AND b.deleted = 0 - LEFT JOIN main_system ms ON ssf.main_system_guid = ms.main_system_guid AND ms.deleted = 0 - LEFT JOIN sub_system ss ON ssf.sub_system_guid = ss.sub_system_guid AND ss.deleted = 0"; + CONCAT(b.full_name, ' - ', v1.system_key, ' - ', v2.system_key) + FROM ( + SELECT + ssf.building_tag, + ssf.main_system_tag, + ssf.sub_system_tag + FROM sub_system_floor ssf + WHERE ssf.deleted = 0 AND ssf.floor_tag = @floor_tag + ) ssf + LEFT JOIN building b ON ssf.building_tag = b.building_tag AND b.deleted = 0 + LEFT JOIN variable v1 ON ssf.main_system_tag = v1.system_value AND v1.system_type = @main_system_type AND v1.deleted = 0 + LEFT JOIN variable v2 ON ssf.sub_system_tag = v2.system_value AND v2.system_type = @sub_system_type AND v2.deleted = 0"; - var sub_system_floors = await backendRepository.GetAllAsync(sub_system_where, new { Guid = guid }); + var sub_system_floors = await backendRepository.GetAllAsync(sub_system_where, new { floor_tag = buildFloor.Full_name, main_system_type = main_system_name, sub_system_type = sub_system_name }); if (sub_system_floors.Count > 0) { apiResult.Code = "9997"; diff --git a/Backend/Models/BuildModel.cs b/Backend/Models/BuildModel.cs index 25e47bd..ab59ef2 100644 --- a/Backend/Models/BuildModel.cs +++ b/Backend/Models/BuildModel.cs @@ -23,6 +23,7 @@ namespace Backend.Models { public string Floor_guid { get; set; } //樓層GUID public string Building_guid { get; set; } //區域GUID + public string Building_tag { get; set; } //區域GUID public string Full_name { get; set; } //建築名稱 public string InitMapName { get; set; } //使用者命名平面圖檔檔名 public string MapUrl { get; set; } //使用者命名平面圖檔檔名 @@ -43,6 +44,7 @@ namespace Backend.Models public class BuildInfoPriority { public string Building_guid { get; set; } //區域GUID + public string Building_tag { get; set; } //區域TAG public int Priority { get; set; } } diff --git a/Backend/Views/BuildInfo/Index.cshtml b/Backend/Views/BuildInfo/Index.cshtml index 956fd36..9e49dfb 100644 --- a/Backend/Views/BuildInfo/Index.cshtml +++ b/Backend/Views/BuildInfo/Index.cshtml @@ -163,6 +163,9 @@ selected_build_guid = $(this).parents('tr').attr('data-guid'); $('#build-modal .modal-title').html("區域基本資料 - 修改"); + $('#build_name_tag').val(selected_build_guid); + $('#build_name_tag').prop('disabled', true); + $("#save-building-btn").attr("onClick", "EditBuild()"); $('#build_name_modal').val($(this).parents('tr')[0].children[1].innerText); $('#ip_address_modal').val($(this).parents('tr')[0].children[2].innerText); $('#ip_port_modal').val($(this).parents('tr')[0].children[3].innerText); @@ -187,7 +190,7 @@ if (result.value) { var url = "/BuildInfo/DeleteOneBuild/"; var send_data = { - guid: selected_build_guid + tag: selected_build_guid } $.post(url, send_data, function (rel) { if (rel.code == "9999") { @@ -218,7 +221,9 @@ function AddBuild() { selected_build_guid = "0"; BuildInfoValidate.resetForm(); + $("#save-building-btn").attr("onClick", "SaveBuild()"); $("#build-modal .modal-title").html("區域基本資料 - 新增"); + $('#build_name_tag').prop('disabled', false); $("#build-form").trigger("reset"); $("#build-modal").modal(); @@ -252,6 +257,41 @@ if ($("#build-form").valid()) { $("#save-building-btn").html('').attr("disabled", true); var url = "/BuildInfo/SaveBuildInfo"; + var send_data = { + building_tag: $('#build_name_tag').val(), + Full_name: $('#build_name_modal').val(), + Ip_address: $('#ip_address_modal').val(), + Ip_port: $('#ip_port_modal').val() + } + + $.post(url, send_data, function (rel) { + $("#save-building-btn").html('確定').attr("disabled", false); + if (rel.code != "0000") { + if (rel.code == "9999") { + toast_error(rel.msg); + } + else { + toast_warning(rel.msg); + } + return; + } + else { + toast_ok(rel.msg); + buildInfoTable.ajax.reload(null, false); + $('#build-modal').modal('hide'); + return; + } + }, 'json') + .fail(function (xhr, status, error) { + $("#save-building-btn").html('確定').attr("disabled", false); + }); + } + } + + function EditBuild() { + if ($("#build-form").valid()) { + $("#save-building-btn").html('').attr("disabled", true); + var url = "/BuildInfo/EditBuildInfo"; var send_data = { building_tag: selected_build_guid, Full_name: $('#build_name_modal').val(), @@ -342,7 +382,7 @@ "url": "/BuildInfo/BuildFloorList", "type": "POST", "data": function (d) { - d.BuildGuid = selected_build_guid_top; + d.build_tag = selected_build_guid_top; }, "dataSrc": function (rel) { if (rel.code == "9999") { diff --git a/Backend/Views/BuildInfo/_BuildInfo.cshtml b/Backend/Views/BuildInfo/_BuildInfo.cshtml index c0d2dc3..fe932af 100644 --- a/Backend/Views/BuildInfo/_BuildInfo.cshtml +++ b/Backend/Views/BuildInfo/_BuildInfo.cshtml @@ -40,6 +40,10 @@
+
+ + +
diff --git a/Backend/wwwroot/upload/floor_map/be95566e-860e-48cb-af54-9f98218663b9.svg b/Backend/wwwroot/upload/floor_map/be95566e-860e-48cb-af54-9f98218663b9.svg new file mode 100644 index 0000000..e609309 --- /dev/null +++ b/Backend/wwwroot/upload/floor_map/be95566e-860e-48cb-af54-9f98218663b9.svg @@ -0,0 +1,5 @@ + + + + 410 + From 6fbc9b41fbb4a161d4f1daf1f56be0e9839c11dd Mon Sep 17 00:00:00 2001 From: dev02 Date: Fri, 21 Oct 2022 19:40:38 +0800 Subject: [PATCH 09/14] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=80=E5=9F=9F=E9=81=B8=E5=96=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/BuildInfoController.cs | 10 +- Backend/Controllers/BuildMenuController.cs | 263 +++++++++--------- Backend/Controllers/MybaseController.cs | 3 + .../Controllers/SystemCategoryController.cs | 52 ++-- Backend/Models/BuildMenu.cs | 12 +- Backend/Views/BuildMenu/Index.cshtml | 78 +++--- 6 files changed, 212 insertions(+), 206 deletions(-) diff --git a/Backend/Controllers/BuildInfoController.cs b/Backend/Controllers/BuildInfoController.cs index f4e4265..9372572 100644 --- a/Backend/Controllers/BuildInfoController.cs +++ b/Backend/Controllers/BuildInfoController.cs @@ -19,8 +19,6 @@ namespace Backend.Controllers { private readonly IBackendRepository backendRepository; private string mapFileSaveAsPath = ""; - private string main_system_name = "device_system_category_layer2"; - private string sub_system_name = "device_system_category_layer1"; public BuildInfoController(IBackendRepository backendRepository) { @@ -546,7 +544,7 @@ namespace Backend.Controllers //判斷區域選單是否還有使用該樓層 var sub_system_where = $@"SELECT - CONCAT(b.full_name, ' - ', v1.system_key, ' - ', v2.system_key) + CONCAT(b.full_name, ' - ', mv.system_key, ' - ', sv.system_key) FROM ( SELECT ssf.building_tag, @@ -556,10 +554,10 @@ namespace Backend.Controllers WHERE ssf.deleted = 0 AND ssf.floor_tag = @floor_tag ) ssf LEFT JOIN building b ON ssf.building_tag = b.building_tag AND b.deleted = 0 - LEFT JOIN variable v1 ON ssf.main_system_tag = v1.system_value AND v1.system_type = @main_system_type AND v1.deleted = 0 - LEFT JOIN variable v2 ON ssf.sub_system_tag = v2.system_value AND v2.system_type = @sub_system_type AND v2.deleted = 0"; + LEFT JOIN variable mv ON ssf.main_system_tag = mv.system_value AND mv.system_type = @main_system_type AND mv.deleted = 0 + LEFT JOIN variable sv ON ssf.sub_system_tag = sv.system_value AND sv.system_type = @sub_system_type AND sv.deleted = 0"; - var sub_system_floors = await backendRepository.GetAllAsync(sub_system_where, new { floor_tag = buildFloor.Full_name, main_system_type = main_system_name, sub_system_type = sub_system_name }); + var sub_system_floors = await backendRepository.GetAllAsync(sub_system_where, new { floor_tag = buildFloor.Full_name, main_system_type = main_system_type, sub_system_type = sub_system_type }); if (sub_system_floors.Count > 0) { apiResult.Code = "9997"; diff --git a/Backend/Controllers/BuildMenuController.cs b/Backend/Controllers/BuildMenuController.cs index 22bdc87..0cf4590 100644 --- a/Backend/Controllers/BuildMenuController.cs +++ b/Backend/Controllers/BuildMenuController.cs @@ -29,7 +29,7 @@ namespace Backend.Controllers try { - var sqlString = @$"select building_guid 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"; @@ -45,15 +45,22 @@ namespace Backend.Controllers return apiResult; } [HttpPost] - public async Task>> MainListBybuild(string build) + public async Task>> MainListBybuild(string building_tag) { ApiResult> apiResult = new ApiResult>(); List KeyValue = new List(); try { - var sqlString = @$"select ms.main_system_guid value, ms.full_name name from (select main_system_guid from building_menu bm where bm.building_guid = '{build}' group by bm.main_system_guid ) bm left join main_system ms on ms.main_system_guid = bm.main_system_guid ORDER BY ms.priority ASC"; - KeyValue = await backendRepository.GetAllAsync(sqlString); + var sqlString = @$"select v.system_value value, v.system_key name + from ( + select main_system_tag from building_menu bm where bm.building_tag = @building_tag group by bm.main_system_tag + ) bm + left join variable v on v.system_value = bm.main_system_tag AND v.system_type = @main_system_type and v.deleted = 0 + ORDER BY v.system_priority ASC"; + + var param = new { building_tag = building_tag, main_system_type = main_system_type }; + KeyValue = await backendRepository.GetAllAsync(sqlString, param); apiResult.Code = "0000"; apiResult.Data = KeyValue; @@ -74,8 +81,13 @@ namespace Backend.Controllers List KeyValue = new List(); try { - var sqlString = @$"select ms.full_name Name,ms.main_system_guid Value from main_system ms where ms.deleted = 0 and ms.status = 0 ORDER BY ms.priority ASC"; - KeyValue = await backendRepository.GetAllAsync(sqlString); + var sqlString = @$"select system_key Name, system_value Value + from variable + where deleted = 0 and system_type = @main_system_type + ORDER BY system_priority ASC"; + + var param = new { main_system_type = main_system_type }; + KeyValue = await backendRepository.GetAllAsync(sqlString, param); apiResult.Code = "0000"; apiResult.Data = KeyValue; @@ -96,14 +108,16 @@ namespace Backend.Controllers List KeyValue = new List(); try { + var mainList = await backendRepository.GetAllAsync("select id from variable where system_value = @main_system_tag and system_type = @main_system_type", new { main_system_tag = post.main_system_tag, main_system_type = main_system_type}); var sqlString = @$"select - ss.sub_system_guid value,ss.full_name name - from sub_system ss - left join ( - select * from building_menu bm where bm.building_guid = '{post.build}') bm - on ss.sub_system_guid = bm.sub_system_guid - where bm.sub_system_guid is null and ss.deleted = 0 and ss.status = 0 and ss.main_system_guid = @guid ORDER BY ss.priority ASC, ss.created_at DESC"; - KeyValue = await backendRepository.GetAllAsync(sqlString, new { guid = post.main }); + sv.system_value value, sv.system_key name + from variable sv + left join ( + select * from building_menu bm where bm.building_tag = @building_tag + ) bm + on sv.system_value = bm.sub_system_tag + where bm.sub_system_tag is null and sv.deleted = 0 and sv.system_parent_id in @mainList ORDER BY sv.system_priority ASC, sv.created_at DESC"; + KeyValue = await backendRepository.GetAllAsync(sqlString, new { building_tag = post.building_tag, mainList = mainList}); apiResult.Code = "0000"; apiResult.Data = KeyValue; @@ -125,14 +139,16 @@ namespace Backend.Controllers ApiResult apiResult = new ApiResult(); try { - var get = await backendRepository.GetOneAsync("building_menu", $"building_guid = '{buildMenu.building_guid}' and main_system_guid = '{buildMenu.main_system_guid}' and sub_system_guid = '{buildMenu.sub_system_guid}'"); + var get = await backendRepository.GetOneAsync("building_menu", $"building_tag = '{buildMenu.building_tag}' and main_system_tag = '{buildMenu.main_system_tag}' and sub_system_tag = '{buildMenu.sub_system_tag}'"); if (get == null) { + var subV = await backendRepository.GetOneAsync("variable", "system_value = @sub_tag and system_type = @sub_system_type", new { sub_tag = buildMenu.sub_system_tag, sub_system_type = sub_system_type }); + var dictionary = new Dictionary() { - {"@building_guid", buildMenu.building_guid}, - {"@main_system_guid",buildMenu.main_system_guid }, - {"@sub_system_guid", buildMenu.sub_system_guid}, + {"@building_tag", buildMenu.building_tag}, + {"@main_system_tag",buildMenu.main_system_tag }, + {"@sub_system_tag", buildMenu.sub_system_tag}, {"@drawing",buildMenu.drawing }, {"@created_by",myUserInfo.Userinfo_guid }, {"@planimetric_click",buildMenu.planimetric_click} @@ -143,8 +159,8 @@ namespace Backend.Controllers if (buildMenu.system_url != null && buildMenu.system_url.CompareTo("http://") < 0 && buildMenu.system_url.CompareTo("https://") < 0) { //未包含http || https 抓該棟ip + port - var building_where = @"deleted = 0 AND building_guid = @Building_guid"; - var building = await backendRepository.GetOneAsync("building", building_where, new { Building_guid = buildMenu.building_guid }); + var building_where = @"deleted = 0 AND building_tag = @Building_tag"; + var building = await backendRepository.GetOneAsync("building", building_where, new { Building_tag = buildMenu.building_tag }); buildMenu.system_url = string.Format("http://{0}:{1}{2}", building.Ip_address, building.Ip_port, buildMenu.system_url); } @@ -156,8 +172,8 @@ namespace Backend.Controllers if (buildMenu.system_url != null && buildMenu.system_url.CompareTo("http://") < 0 && buildMenu.system_url.CompareTo("https://") < 0) { //未包含http || https 抓該棟ip + port - var building_where = @"deleted = 0 AND building_guid = @Building_guid"; - var building = await backendRepository.GetOneAsync("building", building_where, new { Building_guid = buildMenu.building_guid }); + var building_where = @"deleted = 0 AND building_tag = @Building_tag"; + var building = await backendRepository.GetOneAsync("building", building_where, new { Building_tag = buildMenu.building_tag }); buildMenu.system_url = string.Format("http://{0}:{1}{2}", building.Ip_address, building.Ip_port, buildMenu.system_url); } @@ -175,8 +191,14 @@ namespace Backend.Controllers await backendRepository.AddOneByCustomTable(dictionary, "building_menu"); - var max = await backendRepository.GetOneAsync("select Max(CONVERT(int,SUBSTRING(AuthCode,2,5))) AuthCode from auth_page ap where ap.AuthCode like 'F%'"); - var page = await backendRepository.GetOneAsync($"select ss.full_name SubName,ms.full_name MainName from sub_system ss left join main_system ms on ms.main_system_guid = ss.main_system_guid where ss.sub_system_guid = '{buildMenu.sub_system_guid}' and ms.main_system_guid = '{buildMenu.main_system_guid}'"); + var max = await backendRepository.GetOneAsync("select Max(CONVERT(SUBSTRING(AuthCode,2,5), SIGNED)) AuthCode from auth_page ap where ap.AuthCode like 'F%'"); + + var pageSql = $@"select sv.system_key SubName, mv.system_key MainName + from variable sv + left join variable mv on sv.system_parent_id = mv.id + where (sv.system_value = @sub_system_tag and sv.system_type = @sub_system_type) and (mv.system_value = @main_system_tag and mv.system_type = @main_system_type)"; + var pageParam = new { sub_system_tag = buildMenu.sub_system_tag, main_system_tag = buildMenu.main_system_tag, sub_system_type = sub_system_type, main_system_type = main_system_type}; + var page = await backendRepository.GetOneAsync(pageSql, pageParam); var pagedictionary = new Dictionary() { @@ -184,42 +206,26 @@ namespace Backend.Controllers {"@AuthType", 1 }, {"@MainName", page.MainName}, {"@SubName",page.SubName}, - {"@building_guid",buildMenu.building_guid}, - {"@ShowView",buildMenu.sub_system_guid} + {"@building_tag",buildMenu.building_tag}, + {"@ShowView",subV.id} }; await backendRepository.AddOneByCustomTable(pagedictionary, "auth_page"); + var param = new { main_system_type = main_system_type, sub_system_type = sub_system_type }; await backendRepository.ExecuteSql(@"DELETE FROM auth_page - WHERE auth_page.AuthCode like 'F%'; - INSERT INTO auth_page (AuthCode,AuthType,MainName,SubName,building_guid,ShowView) - SELECT 'F' + CONVERT(varchar,ROW_NUMBER() OVER(ORDER BY bm.building_guid ASC)) AuthCode,'1' AuthType,ms.full_name MainName,ss.full_name SubName,bm.building_guid,bm.sub_system_guid ShowView FROM building_menu bm - left join main_system ms on ms.main_system_guid = bm.main_system_guid - left join sub_system ss on ss.sub_system_guid = bm.sub_system_guid"); + WHERE auth_page.AuthCode like 'F%'; + INSERT INTO auth_page (AuthCode,AuthType,MainName,SubName,building_tag,ShowView) + SELECT concat('F', CONVERT(ROW_NUMBER() OVER(ORDER BY bm.building_tag ASC), nchar)) AuthCode, '1' as AuthType, + mv.system_key MainName, sv.system_key SubName, bm.building_tag, sv.id ShowView + FROM building_menu bm + LEFT JOIN variable mv ON bm.main_system_tag = mv.system_value AND mv.system_type = @main_system_type + LEFT JOIN variable sv ON bm.sub_system_tag = sv.system_value AND sv.system_type = @sub_system_type", param); await backendRepository.ExecuteSql(@"delete a from role_auth a join role b on a.role_guid = b.role_guid where b.layer = 0; INSERT INTO role_auth (role_guid,AuthCode,created_by) SELECT r.role_guid,ap.AuthCode,'0' created_by FROM auth_page ap,role r WHERE r.layer = 0;"); - #region 新增至派送資料表 - var sql = $@"SELECT ra.* FROM role_auth ra join role r on ra.role_guid = r.role_guid where r.layer = 0"; - var role_auths = await backendRepository.GetAllAsync(sql); - - List> role_auth_dicts = new List>(); - foreach (var role_auth in role_auths) - { - Dictionary role_auth_dict = new Dictionary() - { - { "role_guid", role_auth.Role_guid}, - { "@AuthCode", role_auth.AuthCode}, - }; - - role_auth_dicts.Add(role_auth_dict); - } - - await backendRepository.ManualInsertBackgroundServiceTask("", "", "role_auth", "purge_specify_insert", role_auth_dicts); - #endregion - apiResult.Code = "0000"; apiResult.Msg = "儲存成功"; } @@ -237,8 +243,8 @@ namespace Backend.Controllers if (buildMenu.system_url != null && buildMenu.system_url.CompareTo("http://") < 0 && buildMenu.system_url.CompareTo("https://") < 0) { //未包含http || https 抓該棟ip + port - var building_where = @"deleted = 0 AND building_guid = @Building_guid"; - var building = await backendRepository.GetOneAsync("building", building_where, new { Building_guid = buildMenu.building_guid }); + var building_where = @"deleted = 0 AND building_tag = @Building_tag"; + var building = await backendRepository.GetOneAsync("building", building_where, new { Building_tag = buildMenu.building_tag }); buildMenu.system_url = string.Format("http://{0}:{1}{2}", building.Ip_address, building.Ip_port, buildMenu.system_url); } @@ -250,8 +256,8 @@ namespace Backend.Controllers if (buildMenu.system_url != null && buildMenu.system_url.CompareTo("http://") < 0 && buildMenu.system_url.CompareTo("https://") < 0) { //未包含http || https 抓該棟ip + port - var building_where = @"deleted = 0 AND building_guid = @Building_guid"; - var building = await backendRepository.GetOneAsync("building", building_where, new { Building_guid = buildMenu.building_guid }); + var building_where = @"deleted = 0 AND building_tag = @Building_tag"; + var building = await backendRepository.GetOneAsync("building", building_where, new { Building_tag = buildMenu.building_tag }); buildMenu.system_url = string.Format("http://{0}:{1}{2}", building.Ip_address, building.Ip_port, buildMenu.system_url); } @@ -267,7 +273,7 @@ namespace Backend.Controllers dictionary.Add("@planimetric_floor_guid", buildMenu.planimetric_floor_guid); } - await backendRepository.UpdateOneByCustomTable(dictionary, "building_menu", $"building_guid = '{buildMenu.building_guid}' and main_system_guid = '{buildMenu.main_system_guid}' and sub_system_guid = '{buildMenu.sub_system_guid}'"); + await backendRepository.UpdateOneByCustomTable(dictionary, "building_menu", $"building_tag = '{buildMenu.building_tag}' and main_system_tag = '{buildMenu.main_system_tag}' and sub_system_tag = '{buildMenu.sub_system_tag}'"); apiResult.Code = "0000"; apiResult.Msg = "儲存成功"; @@ -291,15 +297,16 @@ namespace Backend.Controllers try { buildMenuTables = await backendRepository.GetAllAsync($@"select bm.*, - case drawing when 1 then '樓層平面圖' when 2 then '系統圖' when 4 then '昇位圖' end drawing_name, - case icon_click when 1 then '開' when 0 then '關' end icon_click_name, - case planimetric_click when 1 then '開' when 0 then '關' end planimetric_click_name, - ms.full_name main_system_guid_name, ss.full_name sub_system_guid_name,ff.full_name floor_guid_name - from building_menu bm - left join main_system ms on ms.main_system_guid = bm.main_system_guid - left join sub_system ss on ss.sub_system_guid = bm.sub_system_guid - left join floor ff on ff.floor_guid = bm.planimetric_floor_guid - where bm.building_guid = '{post.build}' and bm.main_system_guid in @MainList ORDER BY ms.priority ASC, ss.priority ASC, ss.created_at DESC ", new { MainList = post.MainList }); + case drawing when 1 then '樓層平面圖' when 2 then '系統圖' when 4 then '昇位圖' end drawing_name, + case icon_click when 1 then '開' when 0 then '關' end icon_click_name, + case planimetric_click when 1 then '開' when 0 then '關' end planimetric_click_name, + mv.system_key main_system_guid_name, sv.system_key sub_system_guid_name,ff.full_name floor_guid_name + from building_menu bm + left join variable mv on bm.main_system_tag = mv.system_value and mv.system_type = @main_system_type and mv.deleted = 0 + left join variable sv on bm.sub_system_tag = sv.system_value and sv.system_type = @sub_system_type and sv.deleted = 0 + left join floor ff on ff.floor_guid = bm.planimetric_floor_guid + where bm.building_tag = @building_tag and bm.main_system_tag in @MainList ORDER BY mv.system_priority ASC, sv.system_priority ASC, sv.created_at DESC ", + new { building_tag = post.building_tag, MainList = post.MainList, main_system_type = main_system_type, sub_system_type = sub_system_type }); apiResult.Code = "0000"; apiResult.Data = buildMenuTables; @@ -324,9 +331,11 @@ namespace Backend.Controllers try { var BuildMenu = await backendRepository.GetOneAsync( - $@"select *,ss.full_name sub_system_guid_name from building_menu bm - left join sub_system ss on bm.sub_system_guid = ss.sub_system_guid - where bm.building_guid = @bg and bm.main_system_guid = @msg and bm.sub_system_guid = @ssg", new { bg = post.build, msg = post.main, ssg = post.sub }); + $@"select *, sv.system_key sub_system_guid_name + from building_menu bm + left join variable sv on bm.sub_system_tag = sv.system_value and sv.system_type = @sub_system_type + where bm.building_tag = @building_tag and bm.main_system_tag = @main_system_tag and bm.sub_system_tag = @sub_system_tag" + , new { building_tag = post.building_tag, main_system_tag = post.main_system_tag, sub_system_tag = post.sub_system_tag, sub_system_type = sub_system_type }); apiResult.Code = "0000"; apiResult.Data = BuildMenu; } @@ -346,8 +355,9 @@ namespace Backend.Controllers ApiResult apiResult = new ApiResult(); try { - await backendRepository.PurgeOneByGuidWithCustomDBNameAndTable("building_menu", $"building_guid = '{post.build}' and main_system_guid = '{post.main}' and sub_system_guid = '{post.sub}'"); - var authcode = await backendRepository.GetOneAsync(@$"select AuthCode from auth_page where building_guid = '{post.build}' and ShowView = '{post.sub}'"); + await backendRepository.PurgeOneByGuidWithCustomDBNameAndTable("building_menu", $"building_tag = '{post.building_tag}' and main_system_tag = '{post.main_system_tag}' and sub_system_tag = '{post.sub_system_tag}'"); + var subV = await backendRepository.GetOneAsync(@$"select * from variable where system_value = @sub_system_tag and system_type = sub_system_type and deleted = 0", new { sub_system_tag = post.sub_system_tag, sub_system_type = sub_system_type }); + var authcode = await backendRepository.GetOneAsync(@$"select AuthCode from auth_page where building_tag = @building_tag and ShowView = @sub_id", new {post.building_tag, subV.id}); if (authcode != null) { await backendRepository.PurgeOneByGuidWithCustomDBNameAndTable("role_auth", $" AuthCode = '{authcode}'"); @@ -356,25 +366,6 @@ namespace Backend.Controllers INSERT INTO role_auth (role_guid,AuthCode,created_by) SELECT r.role_guid,ap.AuthCode,'0' created_by FROM auth_page ap,role r WHERE r.layer = 0;"); - - #region 新增至派送資料表 - var sql = $@"SELECT ra.* FROM role_auth ra join role r on ra.role_guid = r.role_guid where r.layer = 0"; - var role_auths = await backendRepository.GetAllAsync(sql); - - List> role_auth_dicts = new List>(); - foreach (var role_auth in role_auths) - { - Dictionary role_auth_dict = new Dictionary() - { - { "role_guid", role_auth.Role_guid}, - { "@AuthCode", role_auth.AuthCode}, - }; - - role_auth_dicts.Add(role_auth_dict); - } - - await backendRepository.ManualInsertBackgroundServiceTask("", "", "role_auth", "purge_specify_insert", role_auth_dicts); - #endregion } apiResult.Code = "0000"; apiResult.Msg = "刪除成功"; @@ -396,13 +387,18 @@ namespace Backend.Controllers ApiResult> apiResult = new ApiResult>(); try { + var param = new { building_tag = post.building_tag, main_system_tag = post.main_system_tag, sub_system_tag = post.sub_system_tag, main_system_type = main_system_type, sub_system_type = sub_system_type }; buildMenuFloorTables = await backendRepository.GetAllAsync($@" - select f.full_name floor_guid_name,sf.*,ms.full_name main_system_guid_name,ss.full_name sub_system_guid_name - from (select * from sub_system_floor ssf where ssf.building_guid = '{post.build}' and ssf.main_system_guid = '{post.main}' and ssf.sub_system_guid = '{post.sub}' and deleted = 0 and status = 0) sf - left join floor f on sf.floor_guid = f.floor_guid - left join main_system ms on ms.main_system_guid = sf.main_system_guid - left join sub_system ss on ss.sub_system_guid = sf.sub_system_guid - ORDER BY ms.priority, ss.priority, f.priority"); + select sf.id sub_system_floor_id, f.full_name floor_guid_name, sf.*, mv.system_key main_system_guid_name, sv.system_key sub_system_guid_name + from ( + select * + from sub_system_floor ssf + where ssf.building_tag = @building_tag and ssf.main_system_tag = @main_system_tag and ssf.sub_system_tag = @sub_system_tag and deleted = 0 and status = 0 + ) sf + left join floor f on sf.floor_tag = f.full_name + left join variable mv on sf.main_system_tag = mv.system_value and mv.system_type = @main_system_type and mv.deleted = 0 + left join variable sv on sf.sub_system_tag = sv.system_value and sv.system_type = @sub_system_type and sv.deleted = 0 + ORDER BY mv.system_priority, sv.system_priority, f.priority", param); apiResult.Code = "0000"; apiResult.Data = buildMenuFloorTables; } @@ -426,12 +422,17 @@ namespace Backend.Controllers List KeyValue = new List(); try { - var sqlString = @$"select fg.floor_guid value, fg.full_name name from - (select * from floor fg where fg.building_guid = '{post.build}' and fg.deleted = 0 and fg.status = 0 ) fg - left join (select * from sub_system_floor where building_guid = '{post.build}' and main_system_guid = '{post.main}' and sub_system_guid = '{post.sub}' and deleted = 0 and status = 0) ssf - on ssf.floor_guid = fg.floor_guid - where ssf.floor_guid is null ORDER BY fg.priority"; - KeyValue = await backendRepository.GetAllAsync(sqlString); + var param = new { building_tag = post.building_tag, main_system_tag = post.main_system_tag, sub_system_tag = post.sub_system_tag }; + var sqlString = @$"select f.floor_guid value, f.full_name name + from ( + select * from floor f where f.building_tag = @building_tag and f.deleted = 0 and f.status = 0 + ) f + left join ( + select * from sub_system_floor where building_tag = @building_tag and main_system_tag = @main_system_tag and sub_system_tag = @sub_system_tag and deleted = 0 and status = 0 + ) ssf + on ssf.floor_tag = f.full_name + where ssf.floor_tag is null ORDER BY f.priority"; + KeyValue = await backendRepository.GetAllAsync(sqlString, param); apiResult.Code = "0000"; apiResult.Data = KeyValue; @@ -457,11 +458,11 @@ namespace Backend.Controllers { var dictionary = new Dictionary() { - {"@sub_system_floor_guid", Guid.NewGuid()}, - {"@building_guid",menuInfloor.build}, - {"@main_system_guid", menuInfloor.main}, - {"@sub_system_guid",menuInfloor.sub}, - {"@floor_guid",a}, + {"@building_tag", menuInfloor.building_tag}, + {"@main_system_tag", menuInfloor.main_system_tag}, + {"@sub_system_tag",menuInfloor.sub_system_tag}, + {"@floor_tag", a}, + {"@is_link", 1}, {"@created_by", myUserInfo.Userinfo_guid} }; listdictionary.Add(dictionary); @@ -481,32 +482,32 @@ namespace Backend.Controllers return apiResult; } [HttpPost] - public async Task> DeleteBuildFloorMenu(string subfloorguid) + public async Task> DeleteBuildFloorMenu(string sub_system_floor_id) { ApiResult apiResult = new ApiResult(); try { //檢查該樓層底下是否有設備 - var sql = $@" - SELECT - CONCAT(b.full_name, ' - ', ms.full_name, ' - ', ss.full_name , ' - ', f.full_name) - FROM device d - LEFT JOIN ( - SELECT * - FROM sub_system_floor ssf - WHERE ssf.deleted = 0 AND ssf.sub_system_floor_guid = @Guid) ssf - ON d.deleted = 0 - AND d.building_guid = ssf.building_guid - AND d.main_system_guid = ssf.main_system_guid - AND d.sub_system_guid = ssf.sub_system_guid - AND d.floor_guid = ssf.floor_guid - LEFT JOIN building b ON b.deleted = 0 AND d.building_guid = b.building_guid - LEFT JOIN main_system ms ON ms.deleted = 0 AND d.main_system_guid = ms.main_system_guid - LEFT JOIN sub_system ss ON ss.deleted = 0 AND d.sub_system_guid = ss.sub_system_guid - LEFT JOIN floor f ON f.deleted = 0 AND d.floor_guid = f.floor_guid - WHERE ssf.sub_system_floor_guid = @Guid"; + var sql = $@"SELECT + CONCAT(b.full_name, ' - ', mv.system_key, ' - ', sv.system_key, ' - ', f.full_name) + FROM device d + LEFT JOIN ( + SELECT * + FROM sub_system_floor ssf + WHERE ssf.deleted = 0 AND ssf.id = @sub_system_floor_id + ) ssf + ON d.deleted = 0 + AND d.device_building_tag = ssf.building_tag + AND d.device_system_tag = ssf.main_system_tag + AND d.device_name_tag = ssf.sub_system_tag + AND d.device_floor_tag = ssf.floor_tag + LEFT JOIN building b ON b.deleted = 0 AND d.device_building_tag = b.building_tag + LEFT JOIN variable mv on mv.deleted = 0 AND d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0 + LEFT JOIN variable sv on sv.deleted = 0 AND d.device_name_tag = sv.system_value AND sv.system_type = @sub_system_type and sv.deleted = 0 + LEFT JOIN floor f ON f.deleted = 0 AND d.full_name = f.full_name + WHERE ssf.id = @sub_system_floor_id"; - var sub_system_floors = await backendRepository.GetAllAsync(sql, new { Guid = subfloorguid }); + var sub_system_floors = await backendRepository.GetAllAsync(sql, new { sub_system_floor_id = sub_system_floor_id, main_system_type = main_system_type, sub_system_type = sub_system_type }); if (sub_system_floors.Count > 0) { apiResult.Code = "9997"; @@ -514,7 +515,7 @@ namespace Backend.Controllers return apiResult; } - await backendRepository.DeleteOne(subfloorguid, "sub_system_floor", "sub_system_floor_guid"); + await backendRepository.DeleteOne(sub_system_floor_id, "sub_system_floor", "id"); apiResult.Code = "0000"; apiResult.Msg = "刪除成功"; } @@ -522,7 +523,7 @@ namespace Backend.Controllers { apiResult.Code = "9999"; apiResult.Msg = "系統內部錯誤，請聯絡管理者。"; - string json = System.Text.Json.JsonSerializer.Serialize(subfloorguid); + string json = System.Text.Json.JsonSerializer.Serialize(sub_system_floor_id); Logger.LogError("【" + controllerName + "/" + actionName + "】" + json); Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); } @@ -536,10 +537,12 @@ namespace Backend.Controllers List KeyValue = new List(); try { - var sqlString = @$"select floor.floor_guid Value,floor.full_name Name from sub_system_floor sf left join floor on sf.floor_guid = floor.floor_guid - where sf.deleted = 0 and sf.status = 0 and sf.building_guid = '{post.build}' and sf.main_system_guid = '{post.main}' and sf.sub_system_guid = '{post.sub}' - ORDER BY floor.priority, floor.created_at"; - KeyValue = await backendRepository.GetAllAsync(sqlString); + var sqlString = @$"select f.floor_guid Value, f.full_name Name + from sub_system_floor sf + left join floor f on sf.floor_tag = f.full_name + where sf.deleted = 0 and sf.status = 0 and sf.building_tag = @building_tag and sf.main_system_tag = @main_system_tag and sf.sub_system_tag = @sub_system_tag + ORDER BY f.priority, f.created_at"; + KeyValue = await backendRepository.GetAllAsync(sqlString, new { building_tag = post.building_tag, main_system_tag = post.main_system_tag, sub_system_type = post.sub_system_tag }); apiResult.Code = "0000"; apiResult.Data = KeyValue; diff --git a/Backend/Controllers/MybaseController.cs b/Backend/Controllers/MybaseController.cs index 700dbbb..13ea16b 100644 --- a/Backend/Controllers/MybaseController.cs +++ b/Backend/Controllers/MybaseController.cs @@ -31,6 +31,9 @@ namespace Backend.Controllers protected MyUserInfo myUserInfo = null; public string controllerName; public string actionName; + public string main_system_type = "device_system_category_layer2"; + public string sub_system_type = "device_system_category_layer3"; + public MybaseController() { } public override void OnActionExecuting(ActionExecutingContext filterContext) { diff --git a/Backend/Controllers/SystemCategoryController.cs b/Backend/Controllers/SystemCategoryController.cs index a907bbe..70ffcde 100644 --- a/Backend/Controllers/SystemCategoryController.cs +++ b/Backend/Controllers/SystemCategoryController.cs @@ -13,8 +13,6 @@ namespace Backend.Controllers { private readonly IBackendRepository backendRepository; - private string main_system_name = "device_system_category_layer2"; - private string sub_system_name = "device_system_category_layer1"; public SystemCategoryController(IBackendRepository backendRepository) { @@ -39,7 +37,7 @@ namespace Backend.Controllers { var sWhere = "deleted = 0 AND system_type = @System_type"; - var param = new { System_type = main_system_name }; + var param = new { System_type = main_system_type }; var systemMainList = await backendRepository.GetAllAsync("variable", sWhere, param, "system_priority ASC, created_at DESC"); @@ -108,13 +106,13 @@ namespace Backend.Controllers //新增 //獲取最新的大類 sWhere = @$"deleted = @Deleted AND system_type = @System_type"; - param = new { Deleted = 0, System_type = main_system_name }; + param = new { Deleted = 0, System_type = main_system_type }; var sOrder = @"id DESC LIMIT 1"; var latestVariable = await backendRepository.GetOneAsync("variable", sWhere, param, sOrder); Dictionary variableMainDic = new Dictionary() { - { "@system_type", main_system_name}, + { "@system_type", main_system_type}, { "@system_key", post.System_key}, { "@system_value", post.system_value}, { "@system_remark", "系統類別(第2層)"}, @@ -142,8 +140,8 @@ namespace Backend.Controllers var AuthCodes = await backendRepository.GetAllAsync( @$"select AuthCode from auth_page ap - join variable sv on ap.ShowView = sv.system_value and sv.system_type = 'device_system_category_layer1' - where sv.id = '{systemMain.id}'"); + join variable sv on ap.ShowView = sv.id and sv.system_type = 'device_system_category_layer1' + where sv.system_parent_id = '{systemMain.id}'"); if(AuthCodes.Count > 0) { @@ -324,17 +322,17 @@ namespace Backend.Controllers //產生一組GUID //獲取最新的大類 sWhere = @$"deleted = @Deleted AND system_type = @System_type"; - param = new { Deleted = 0, System_type = sub_system_name }; + param = new { Deleted = 0, System_type = sub_system_type }; var sOrder = @"id DESC LIMIT 1"; var latestVariable = await backendRepository.GetOneAsync("variable", sWhere, param, sOrder); Dictionary systemSubDic = new Dictionary() { - { "@system_type", sub_system_name}, + { "@system_type", sub_system_type}, { "@system_key", post.System_key}, { "@system_value", post.system_value}, { "@system_parent_id", post.system_parent_id}, - { "@system_remark", "系統類別(第1層)"}, + { "@system_remark", "系統類別(第3層)"}, { "@system_priority", latestVariable.system_priority + 1}, { "@created_by", myUserInfo.Userinfo_guid}, { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")} @@ -411,12 +409,12 @@ namespace Backend.Controllers //檢查是否有未刪除的區域選單 var sbuildMenu = $@"SELECT - CONCAT(b.full_name, ' - ', v2.system_key) + CONCAT(b.full_name, ' - ', sv.system_key) FROM building_menu bm LEFT JOIN building b ON bm.building_tag = b.building_tag AND b.deleted = 0 - LEFT JOIN variable v1 ON bm.sub_system_tag = v1.system_value AND v1.deleted = 0 - LEFT JOIN variable v2 ON v1.system_parent_id = v2.id AND v1.deleted = 0 - WHERE v1.id = @id"; + LEFT JOIN variable sv ON bm.sub_system_tag = sv.system_value AND sv.deleted = 0 + LEFT JOIN variable mv ON sv.system_parent_id = mv.id AND mv.deleted = 0 + WHERE sv.id = @id"; var buildMenus = await backendRepository.GetAllAsync(sbuildMenu, new { id = id }); if (buildMenus.Count > 0) @@ -429,13 +427,13 @@ namespace Backend.Controllers //檢查是否有未刪除的系統小類樓層 var ssubSystemFloor = $@"SELECT - CONCAT(b.full_name, ' - ', v1.full_name, ' - ', v2.full_name, ' - ', f.full_name) + CONCAT(b.full_name, ' - ', mv.full_name, ' - ', sv.full_name, ' - ', f.full_name) FROM sub_system_floor ssf LEFT JOIN building b ON ssf.building_tag = b.building_tag AND b.deleted = 0 - LEFT JOIN variable v2 ON v2.system_value = ssf.sub_system_tag AND v2.deleted = 0 - LEFT JOIN variable v1 ON v1.system_parent_id = v1.id AND v1.deleted = 0 + LEFT JOIN variable sv ON sv.system_value = ssf.sub_system_tag AND sv.deleted = 0 + LEFT JOIN variable mv ON sv.system_parent_id = mv.id AND mv.deleted = 0 LEFT JOIN floor f ON ssf.floor_guid = f.floor_guid AND f.deleted = 0 - WHERE v2.id = @id AND ssf.deleted = 0"; + WHERE sv.id = @id AND ssf.deleted = 0"; var subSystemFloor = await backendRepository.GetAllAsync(sbuildMenu, new { id = id }); if (subSystemFloor.Count > 0) @@ -450,8 +448,8 @@ namespace Backend.Controllers var sdeviceItem = $@"SELECT di.full_name FROM device_item di - INNER JOIN variable v on di.device_name_tag = v.system_value - WHERE v.deleted = 0 AND v.id = @id AND di.deleted = 0"; + INNER JOIN variable sv on di.device_name_tag = sv.system_value + WHERE v.deleted = 0 AND sv.id = @id AND di.deleted = 0"; var deviceItems = await backendRepository.GetAllAsync(sdeviceItem, new { id = id }); if (deviceItems.Count > 0) @@ -568,9 +566,9 @@ namespace Backend.Controllers var sql = @"SELECT di.* FROM device_item di - JOIN variable v1 ON di.device_name_tag = v1.system_value - JOIN variable v2 ON v1.system_parent_id = v2.id AND di.device_system_tag = v2.system_value - WHERE v1.id = @id AND di.deleted = @Deleted"; + JOIN variable sv ON di.device_name_tag = sv.system_value + JOIN variable mv ON sv.system_parent_id = mv.id AND di.device_system_tag = mv.system_value + WHERE sv.id = @id AND di.deleted = @Deleted"; object param = new { Deleted = 0, id = id }; @@ -720,13 +718,13 @@ namespace Backend.Controllers unionsql += " union "; } } - var sql = @$"select v1.system_key msname, b.full_name bname, v2.system_key subname,de.device_last_name as device_name_tag from + var sql = @$"select mv.system_key msname, b.full_name bname, sv.system_key subname,de.device_last_name as device_name_tag from ({unionsql}) de - left join variable v1 on v1.system_value = de.device_system_tag and v1.system_type = @main_system_type + left join variable mv on mv.system_value = de.device_system_tag and mv.system_type = @main_system_type left join building b on b.building_tag = de.building_tag - left join variable v2 on v2.system_value = de.device_name_tag and v1.system_type = @sub_system_type"; + left join variable sv on sv.system_value = de.device_name_tag and sv.system_type = @sub_system_type"; - var param = new { main_system_type = main_system_name, sub_system_type = sub_system_name}; + var param = new { main_system_type = main_system_type, sub_system_type = sub_system_type}; var names = await backendRepository.GetAllAsync(sql, param); var count = 0; foreach (var name in names) diff --git a/Backend/Models/BuildMenu.cs b/Backend/Models/BuildMenu.cs index f677e56..4173361 100644 --- a/Backend/Models/BuildMenu.cs +++ b/Backend/Models/BuildMenu.cs @@ -7,9 +7,9 @@ namespace Backend.Models { public class BuildMenu : Actor { - public string building_guid { get; set; } - public string main_system_guid { get; set; } - public string sub_system_guid { get; set; } + public string building_tag { get; set; } + public string main_system_tag { get; set; } + public string sub_system_tag { get; set; } public byte drawing { get; set; } public byte icon_click { get; set; } public string icon_click_url { get; set; } @@ -27,11 +27,13 @@ namespace Backend.Models public class SubListIn { public string main { get; set; } + public string main_system_tag { get; set; } public string build { get; set; } + public string building_tag { get; set; } } public class BuildMenuTablePost { - public string build { get; set; } + public string building_tag { get; set; } public List MainList { get; set; } } public class BuildMenuTable: BuildMenu @@ -46,6 +48,7 @@ namespace Backend.Models public class MenuIn : SubListIn { public string sub { get; set; } + public string sub_system_tag { get; set; } } public class BuildMenuFloor : Actor { @@ -60,6 +63,7 @@ namespace Backend.Models public class BuildMenuFloorTable : BuildMenuFloor { + public string sub_system_floor_id { get; set; } public string main_system_guid_name { get; set; } public string sub_system_guid_name { get; set; } public string floor_guid_name { get; set; } diff --git a/Backend/Views/BuildMenu/Index.cshtml b/Backend/Views/BuildMenu/Index.cshtml index 9aee64f..a116028 100644 --- a/Backend/Views/BuildMenu/Index.cshtml +++ b/Backend/Views/BuildMenu/Index.cshtml @@ -443,7 +443,7 @@ buildMenuTable = $("#buildMenu_table").DataTable({ "columns": [ { - "data": "building_guid", + "data": "building_tag", "render": function (data, type, row, meta) { return meta.row + 1; } @@ -482,9 +482,9 @@ } ], 'createdRow': function (row, data, dataIndex) { - $(row).attr('bg-guid', data.building_guid); - $(row).attr('ms-guid', data.main_system_guid); - $(row).attr('ss-guid', data.sub_system_guid); + $(row).attr('bg-guid', data.building_tag); + $(row).attr('ms-guid', data.main_system_tag); + $(row).attr('ss-guid', data.sub_system_tag); $(row).attr('ms-name', data.main_system_guid_name); $(row).attr('ss-name', data.sub_system_guid_name); }, @@ -492,8 +492,8 @@ "url": "/BuildMenu/BuildMenuTable", "type": "POST", "data": function (d) { - d.build = SelectBuild, - d.MainList = SelectMainList + d.building_tag = SelectBuild, + d.MainList = SelectMainList }, "dataSrc": function (rel) { if (rel.code == "9999") { @@ -523,7 +523,7 @@ buildMenuFloorTable = $("#buildMenu_floor_table").DataTable({ "columns": [ { - "data": "sub_system_floor_guid", + "data": "sub_system_floor_id", "render": function (data, type, row, meta) { return meta.row + 1; } @@ -543,15 +543,15 @@ } ], 'createdRow': function (row, data, dataIndex) { - $(row).attr('ssf-guid', data.sub_system_floor_guid); + $(row).attr('ssf-guid', data.sub_system_floor_id); }, "ajax": { "url": "/BuildMenu/BuildMenuFloorTable", "type": "POST", "data": function (d) { - d.build = SelectBuild, - d.main = SelectMainSys, - d.sub = SelectSubSys + d.building_tag = SelectBuild, + d.main_system_tag = SelectMainSys, + d.sub_system_tag = SelectSubSys }, "dataSrc": function (rel) { if (rel.code == "9999") { @@ -617,10 +617,10 @@ //#endregion var submain = new Array(0); //#region 以棟別找系統大類 - function GetMainlistByBuild(build) { + function GetMainlistByBuild(building_tag) { var url = "/BuildMenu/MainListBybuild"; var send_data = { - build: build + building_tag: building_tag }; $.post(url, send_data, function (rel) { if (rel.code != "0000") { @@ -683,8 +683,8 @@ function GetSubList(main) { var url = "/BuildMenu/SubListNotAdd"; var send_data = { - main: main, - build: SelectBuild + main_system_tag: main, + building_tag: SelectBuild }; $.post(url, send_data, function (rel) { if (rel.code != "0000") { @@ -791,9 +791,9 @@ var url = "/BuildMenu/SavebuildMenuModal"; var send_data = { - building_guid: $('#build_menu_building_modal').val(), - main_system_guid: $('#build_menu_main_modal').val(), - sub_system_guid: $('#build_menu_sub_modal').val(), + building_tag: $('#build_menu_building_modal').val(), + main_system_tag: $('#build_menu_main_modal').val(), + sub_system_tag: $('#build_menu_sub_modal').val(), drawing: $('input[name="drawing"]:checked').val(), system_url: $('#build_menu_systemurl_modal').val(), icon_click: icon_click, @@ -822,22 +822,22 @@ $('#buildMenu_table').on("click", "button.edit-btn", function () { var url = "/BuildMenu/GetBuildMenu"; var send_data = { - build: $(this).parents('tr').attr('bg-guid'), - main: $(this).parents('tr').attr('ms-guid'), - sub: $(this).parents('tr').attr('ss-guid') + building_tag: $(this).parents('tr').attr('bg-guid'), + main_system_tag: $(this).parents('tr').attr('ms-guid'), + sub_system_tag: $(this).parents('tr').attr('ss-guid') }; $.post(url, send_data, function (rel) { if (rel.code != "0000") { toast_error(rel.msg); } else { - $('#build_menu_building_modal').val(rel.data.building_guid); - $('#build_menu_main_modal').val(rel.data.main_system_guid); + $('#build_menu_building_modal').val(rel.data.building_tag); + $('#build_menu_main_modal').val(rel.data.main_system_tag); $('#build_menu_building_modal').attr('disabled', true); $('#build_menu_main_modal').attr('disabled', true); $('#build_menu_sub_modal').attr('disabled', true); - $('#build_menu_sub_modal').append($("