jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

Browse Source
This commit is contained in:
dev02 2022-10-25 09:11:56 +08:00
commit 1a16539e02
5 changed files with 6035 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Backend/Controllers/DeviceManageController.cs
View File

@ -166,7 +166,7 @@ namespace Backend.Controllers
var sql = $@"SELECT var sql = $@"SELECT
d.*, d.*,
d.device_last_name AS Device_full_name, d.full_name AS Device_full_name,
b.full_name AS Building_full_name, b.full_name AS Building_full_name,
mv.system_key AS Main_system_full_name, mv.system_key AS Main_system_full_name,
sv.system_key AS Sub_system_full_name, sv.system_key AS Sub_system_full_name,
@ -361,10 +361,6 @@ namespace Backend.Controllers
Dictionary<string, object> deviceDic = new Dictionary<string, object>() Dictionary<string, object> deviceDic = new Dictionary<string, object>()
{ {
{ "@device_guid", guid}, { "@device_guid", guid},
{ "@building_tag", post.Building_tag},
{ "@main_system_tag", post.Main_system_tag},
{ "@sub_system_tag", post.Sub_system_tag},
{ "@floor_guid", post.Floor_tag},
{ "@full_name", device_name_tag + device_serial_tag}, { "@full_name", device_name_tag + device_serial_tag},
{ "@device_building_tag", device_building_tag}, { "@device_building_tag", device_building_tag},
{ "@device_system_tag", device_system_tag}, { "@device_system_tag", device_system_tag},

1
Backend/Views/DeviceManage/Index.cshtml
View File

@ -2734,7 +2734,6 @@
var formData = new FormData(); var formData = new FormData();
formData.append("Building_tag", selectedBuilding_tag);
formData.append("Main_system_tag", selectedMain_system_tag); formData.append("Main_system_tag", selectedMain_system_tag);
formData.append("Sub_system_tag", selectedSub_system_tag); formData.append("Sub_system_tag", selectedSub_system_tag);
formData.append("Floor_tag", selectedFloor_tag); formData.append("Floor_tag", selectedFloor_tag);

3016
Backend/wwwroot/upload/floor_map/26121072-5f50-4638-bee9-0ff8c9319350.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 2.0 MiB

3016
Backend/wwwroot/upload/floor_map/94f0afd7-f843-426f-8098-2d69a9d9a995.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 2.0 MiB

4
Repository/BackendRepository/Implement/DeviceManageRepository.cs
View File

@ -35,7 +35,7 @@ namespace Repository.BackendRepository.Implement
string sql = UpdateGenerateString(properties, "device", "device_guid='" + device_guid + "'"); string sql = UpdateGenerateString(properties, "device", "device_guid='" + device_guid + "'");
await conn.ExecuteAsync(sql, device_dict, trans); await conn.ExecuteAsync(sql, device_dict, trans);
await backgroundService.AddTask("", "", "device", "update", device_dict); //await backgroundService.AddTask("", "", "device", "update", device_dict);
if (device_disaster_dicts.Count() > 0) if (device_disaster_dicts.Count() > 0)
{ {
@ -58,7 +58,7 @@ namespace Repository.BackendRepository.Implement
string sql_add_disaster = InsertGenerateString(add_disaster_properties, "device_disaster"); string sql_add_disaster = InsertGenerateString(add_disaster_properties, "device_disaster");
await conn.ExecuteAsync(sql_add_disaster, device_disaster_dicts, trans); await conn.ExecuteAsync(sql_add_disaster, device_disaster_dicts, trans);
await backgroundService.AddTask("", "", "device_disaster", "purge_specify_insert", device_disaster_dicts); //await backgroundService.AddTask("", "", "device_disaster", "purge_specify_insert", device_disaster_dicts);
} }
else else
{ {