diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
index d5c82d0c..3c34a593 100644
--- a/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
+++ b/Src/Dlhis.Basic/Device/Controllers/DevicesController.cs
@@ -139,4 +139,14 @@ public class DevicesController : ControllerBase
{
return await _deviceService.CheckExistsAsync(deviceUniqueNo);
}
+ ///
+ /// 获取设备
+ ///
+ ///
+ ///
+ [HttpGet]
+ public async Task GetSettingASync(string UniqueNo)
+ {
+ return await _deviceService.GetSettingASync(UniqueNo);
+ }
}
diff --git a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
index 708b947a..fb89564d 100644
--- a/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/IDeviceService.cs
@@ -11,4 +11,6 @@ public interface IDeviceService : IScopeDependency
Task SaveAsync(DeviceSaveRequest request);
Task CheckExistsAsync(string deviceUniqueNo);
+
+ 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 73d60440..d95194ac 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -145,5 +145,17 @@ public class DeviceService : IDeviceService
.Where(x => x.UniqueNo == deviceUniqueNo && x.Enable)
.AnyAsync();
}
+
+ ///
+ /// 根据唯一号获取设备
+ ///
+ ///
+ ///
+ public async Task GetSettingASync(string UniqueNo)
+ {
+ var dev =await _dbContext.Queryable().Where(x => x.UniqueNo == UniqueNo).FirstAsync();
+ var deviceResponse = dev.Adapt();
+ return deviceResponse;
+ }
}
diff --git a/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs b/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs
index b7e1772e..a7daf5b8 100644
--- a/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs
+++ b/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs
@@ -66,4 +66,5 @@ public class SettingController : ControllerBase
{
return await _settingService.GetUserSettingAsync(userNo);
}
+
}
diff --git a/Src/Dlhis.Canteen/Setting/Services/ICanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/ICanteenSettingService.cs
index dcf34bac..7b2a47cf 100644
--- a/Src/Dlhis.Canteen/Setting/Services/ICanteenSettingService.cs
+++ b/Src/Dlhis.Canteen/Setting/Services/ICanteenSettingService.cs
@@ -19,5 +19,6 @@ public interface ICanteenSettingService : IScopeDependency
/// 就餐人员档案号
///
Task> GetUserSettingAsync(string userNo);
+
}
diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs
index 7622a450..0d13d529 100644
--- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs
+++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs
@@ -194,4 +194,5 @@ public class CanteenSettingService : ICanteenSettingService
return true;
}
+
}