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

frontAPI 提供前端 device_node 狀態顏色

Browse Source
This commit is contained in:
GiteaAdmin 2023-04-25 22:22:20 +08:00
parent 95c1bc2403
commit 6fe713d22b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/Controllers/NiagaraDataSynchronizeController.cs
View File

@ -102,7 +102,7 @@ namespace Backend.Controllers
} }
string LightSwitchLevel = await niagaraDataSynchronizeRepository.getLightSwitchLevel(); //獲取照明開關 是否在 device or device_node string LightSwitchLevel = await niagaraDataSynchronizeRepository.getLightSwitchLevel(); //獲取照明開關 是否在 device or device_node
await niagaraDataSynchronizeRepository.InsertNiagaraTagList(newDs, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag await niagaraDataSynchronizeRepository.InsertNiagaraTagList(ds, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag
await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel); await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel);
await niagaraDataSynchronizeRepository.CheckDiffFullNameAndCover(); await niagaraDataSynchronizeRepository.CheckDiffFullNameAndCover();
await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName(); await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName();

6
FrontendWebApi/ApiControllers/DeviceManageController.cs
View File

@ -291,9 +291,9 @@ namespace FrontendWebApi.ApiControllers
{ {
List<DeviceLists> dl = new List<DeviceLists>(); List<DeviceLists> dl = new List<DeviceLists>();
sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, d.priority, dk.device_image, d.device_number, CONCAT('{baseURL}', '{deviceKindFilePath}', dk.device_image) AS device_image_url,d.status, sqlString = $@"select d.device_guid, d.full_name, d.device_coordinate, d.priority, dk.device_image, d.device_number, CONCAT('{baseURL}', '{deviceKindFilePath}', dk.device_image) AS device_image_url,d.status,
dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, dk.device_normal_point_name, dk.device_normal_point_id, dk.device_normal_point_guid, dk.device_normal_point_col, dk.device_normal_point_value, dk.device_normal_flashing, dk.device_normal_point_name, dk.device_normal_color,
dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, dk.device_close_point_name, dk.device_close_point_id, dk.device_close_point_guid, dk.device_close_point_col, dk.device_close_point_value, dk.device_close_flashing, dk.device_close_point_name, dk.device_close_color,
dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing, dk.device_error_point_name, dk.device_error_point_id, dk.device_error_point_guid, dk.device_error_point_col, dk.device_error_point_value, dk.device_error_flashing, dk.device_error_point_name, dk.device_error_color,
d.room_dbid, d.device_coordinate_3d, d.forge_dbid d.room_dbid, d.device_coordinate_3d, d.forge_dbid
from device d from device d
left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag

3
FrontendWebApi/Models/Device.cs
View File

@ -66,18 +66,21 @@ namespace FrontendWebApi.Models
public string device_normal_point_name { get; set; } public string device_normal_point_name { get; set; }
public string device_normal_point_value { get; set; } public string device_normal_point_value { get; set; }
public string device_normal_flashing { get; set; } public string device_normal_flashing { get; set; }
public string device_normal_color { get; set; }
public string device_close_point_id { get; set; } public string device_close_point_id { get; set; }
public string device_close_point_guid { get; set; } public string device_close_point_guid { get; set; }
public string device_close_point_col { get; set; } public string device_close_point_col { get; set; }
public string device_close_point_name { get; set; } public string device_close_point_name { get; set; }
public string device_close_point_value { get; set; } public string device_close_point_value { get; set; }
public string device_close_flashing { get; set; } public string device_close_flashing { get; set; }
public string device_close_color { get; set; }
public string device_error_point_id { get; set; } public string device_error_point_id { get; set; }
public string device_error_point_guid { get; set; } public string device_error_point_guid { get; set; }
public string device_error_point_col { get; set; } public string device_error_point_col { get; set; }
public string device_error_point_name { get; set; } public string device_error_point_name { get; set; }
public string device_error_point_value { get; set; } public string device_error_point_value { get; set; }
public string device_error_flashing { get; set; } public string device_error_flashing { get; set; }
public string device_error_color { get; set; }
public string room_dbid { get; set; } public string room_dbid { get; set; }
public string forge_dbid { get; set; } public string forge_dbid { get; set; }
public List<DeviceNode> Device_nodes { get; set; } public List<DeviceNode> Device_nodes { get; set; }