GithubStar/ThingsGateway
1
0
Fork 0
mirror of https://github.com/ThingsGateway/ThingsGateway.git synced 2026-10-23 08:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正导出设备表的sheet名称

Browse Source
This commit is contained in:
Kimdiego2098
2023-11-28 09:30:47 +08:00
parent 7e2e17d38b
commit cd462b9523
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/gateway/ThingsGateway.Gateway.Application/Services/Device/CollectDeviceService.cs
+2
View File
@@ -26,6 +26,8 @@ namespace ThingsGateway.Gateway.Application;
[Injection(Proxy = typeof(OperDispatchProxy))]
public class CollectDeviceService : DeviceService<CollectDevice>, ITransient
{
protected override string DeviceSheetName => ExportHelpers.CollectDeviceSheetName;
public CollectDeviceService(IServiceScopeFactory serviceScopeFactory, IFileService fileService) : base(serviceScopeFactory, fileService)
{
}
framework/gateway/ThingsGateway.Gateway.Application/Services/Device/DeviceService.cs
+4 -4
View File
@@ -206,7 +206,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
var data = await query.ToListAsync();
return await ExportFileAsync(data);
}
protected abstract string DeviceSheetName { get; }
/// <inheritdoc/>
[OperDesc("导出采集设备表", IsRecordPar = false)]
public async Task<MemoryStream> ExportFileAsync(List<T> devDatas = null)
@@ -277,7 +277,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
}
//添加设备页
sheets.Add(ExportHelpers.CollectDeviceSheetName, devExports);
sheets.Add(DeviceSheetName, devExports);
//添加插件属性页
@@ -321,7 +321,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
var collectDevices = new List<T>();
foreach (var item in input)
{
if (item.Key == ExportHelpers.CollectDeviceSheetName)
if (item.Key == DeviceSheetName)
{
var collectDeviceImports = ((ImportPreviewOutput<T>)item.Value).Data;
collectDevices = collectDeviceImports.Values.Adapt<List<T>>();
@@ -362,7 +362,7 @@ public abstract class DeviceService<T> : DbRepository<T> where T : Device, new()
//单页数据
var rows = stream.Query(useHeaderRow: true, sheetName: sheetName).Cast<IDictionary<string, object>>();
#region 采集设备sheet
if (sheetName == ExportHelpers.CollectDeviceSheetName)
if (sheetName == DeviceSheetName)
{
int row = 1;
ImportPreviewOutput<T> importPreviewOutput = new();
framework/gateway/ThingsGateway.Gateway.Application/Services/Device/UploadDeviceService.cs
+1
View File
@@ -21,6 +21,7 @@ namespace ThingsGateway.Gateway.Application;
[Injection(Proxy = typeof(OperDispatchProxy))]
public class UploadDeviceService : DeviceService<Device>, ITransient
{
protected override string DeviceSheetName => ExportHelpers.UploadDeviceSheetName;
public UploadDeviceService(IServiceScopeFactory serviceScopeFactory, IFileService fileService) : base(serviceScopeFactory, fileService)
{
}