diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index 3c34a593..b8eb02e0 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -145,7 +145,7 @@ public class DevicesController : ControllerBase
///
///
[HttpGet]
- public async Task GetSettingASync(string UniqueNo)
+ public async Task> GetSettingASync(string UniqueNo)
{
return await _deviceService.GetSettingASync(UniqueNo);
}
diff --git a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
index ff56245f..f3b9da48 100644
--- a/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
+++ b/Src/Dlhis.Basic/Device/Request/DevicePageRequest.cs
@@ -8,4 +8,9 @@ public class DevicePageRequest : PageDto
/// 平台
///
public string Brand { get; set; }
+
+ ///
+ /// 设备唯一号
+ ///
+ public string UniqueNo { get; set; }
}
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index fb89564d..aa1ee214 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -12,5 +12,5 @@ public interface IDeviceService : IScopeDependency
Task CheckExistsAsync(string deviceUniqueNo);
- Task GetSettingASync(string UniqueNo);
+ Task> GetSettingASync(string UniqueNo);
}
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index d95194ac..6f19aede 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -151,11 +151,18 @@ public class DeviceService : IDeviceService
///
///
///
- public async Task GetSettingASync(string UniqueNo)
+ public async Task> GetSettingASync(DevicePageRequest request)
{
- var dev =await _dbContext.Queryable().Where(x => x.UniqueNo == UniqueNo).FirstAsync();
- var deviceResponse = dev.Adapt();
- return deviceResponse;
+ var page = await _dbContext.Queryable()
+ .Where(x=>x.UniqueNo == request.UniqueNo)
+ .Select(device => new DeviceResponse
+ {
+ FuncsStr = device.Funcs.ToString()
+
+ }, true)
+ .ToPageListAsync(request);
+
+ return page;
}
}