test/iotgateway
1
0
Fork 0
mirror of https://gitee.com/iioter/iotgateway.git synced 2024-12-02 03:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

导出、导入增加"触发"字段

Browse Source
This commit is contained in:
iioter 2024-06-01 08:58:02 +08:00
parent 2f8c01adc6
commit e717ef6274
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IoTGateway.ViewModel/BasicData/ExportDevicesSetting.cs
View File

@ -175,7 +175,7 @@ namespace IoTGateway.ViewModel.BasicData
#region 生成表头 #region 生成表头
string[] colName = { "设备名", "变量名", "方法", "地址", "类型", "大小端", "表达式", "别名","上传", "排序" }; string[] colName = { "设备名", "变量名", "方法", "地址", "类型", "大小端", "表达式", "别名","上传", "排序", "触发" };
IRow row = sheet.CreateRow(currentRow); IRow row = sheet.CreateRow(currentRow);
row.HeightInPoints = 20; row.HeightInPoints = 20;
@ -211,6 +211,8 @@ namespace IoTGateway.ViewModel.BasicData
rowData.CreateCell(currentCol).SetCellValue(deviceVariable.IsUpload); rowData.CreateCell(currentCol).SetCellValue(deviceVariable.IsUpload);
currentCol++; currentCol++;
rowData.CreateCell(currentCol).SetCellValue(deviceVariable.Index); rowData.CreateCell(currentCol).SetCellValue(deviceVariable.Index);
currentCol++;
rowData.CreateCell(currentCol).SetCellValue(deviceVariable.IsTrigger);
currentRow++; currentRow++;
} }
@ -282,11 +284,11 @@ namespace IoTGateway.ViewModel.BasicData
var allDevices = GetAllDevices(); var allDevices = GetAllDevices();
book = GenerateDevicesSheet(book, allDevices); book = GenerateDevicesSheet(book, allDevices);
//Sheet2-通讯设置 //Sheet2-变量配置
var allDeviceVariables = GetAllDeviceVariables(); var allDeviceVariables = GetAllDeviceVariables();
book = GenerateDeviceVariablesSheet(book, allDeviceVariables); book = GenerateDeviceVariablesSheet(book, allDeviceVariables);
//Sheet3-变量配置 //Sheet3-通讯设置
var allDeviceConfigs = GetAllDeviceConfigs(); var allDeviceConfigs = GetAllDeviceConfigs();
book = GenerateDeviceConfigsSheet(book, allDeviceConfigs); book = GenerateDeviceConfigsSheet(book, allDeviceConfigs);

1
IoTGateway.ViewModel/BasicData/ImportExcelVM.cs
View File

@ -178,6 +178,7 @@ namespace IoTGateway.ViewModel.BasicData
variable.Index = string.IsNullOrWhiteSpace(row.GetCell(9)?.ToString()) variable.Index = string.IsNullOrWhiteSpace(row.GetCell(9)?.ToString())
? 999 ? 999
: uint.Parse(row.GetCell(9).ToString()); : uint.Parse(row.GetCell(9).ToString());
variable.IsTrigger = row.GetCell(10)?.ToString().ToLower() == "false" ? false : true;
deviceVariables.Add(variable); deviceVariables.Add(variable);
} }