fix 获取设备

This commit is contained in:
cheche
2024-01-12 15:49:41 +08:00
parent 310620b348
commit 0c28e8d4d3
4 changed files with 18 additions and 6 deletions

View File

@@ -145,7 +145,7 @@ public class DevicesController : ControllerBase
/// <param name="UniqueNo"></param>
/// <returns></returns>
[HttpGet]
public async Task<DeviceResponse> GetSettingASync(string UniqueNo)
public async Task<Pagination<DeviceResponse>> GetSettingASync(string UniqueNo)
{
return await _deviceService.GetSettingASync(UniqueNo);
}

View File

@@ -8,4 +8,9 @@ public class DevicePageRequest : PageDto
/// 平台
/// </summary>
public string Brand { get; set; }
/// <summary>
/// 设备唯一号
/// </summary>
public string UniqueNo { get; set; }
}

View File

@@ -12,5 +12,5 @@ public interface IDeviceService : IScopeDependency
Task<bool> CheckExistsAsync(string deviceUniqueNo);
Task<DeviceResponse> GetSettingASync(string UniqueNo);
Task<Pagination<DeviceResponse>> GetSettingASync(string UniqueNo);
}

View File

@@ -151,11 +151,18 @@ public class DeviceService : IDeviceService
/// </summary>
/// <param name="UniqueNo"></param>
/// <returns></returns>
public async Task<DeviceResponse> GetSettingASync(string UniqueNo)
public async Task<Pagination<DeviceResponse>> GetSettingASync(DevicePageRequest request)
{
var dev =await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == UniqueNo).FirstAsync();
var deviceResponse = dev.Adapt<DeviceResponse>();
return deviceResponse;
var page = await _dbContext.Queryable<DeviceEntity>()
.Where(x=>x.UniqueNo == request.UniqueNo)
.Select(device => new DeviceResponse
{
FuncsStr = device.Funcs.ToString()
}, true)
.ToPageListAsync(request);
return page;
}
}