设备查询

BPA.SAAS.Manage.Application/Device/DeviceServices.cs

@@ -35,7 +35,7 @@ namespace BPA.SAAS.Manage.Application.Device
         /// </summary>
         /// <returns></returns>
         [HttpGet("/api/device/list")]
-        public async Task<List<ListSelectQuery>> GetDeviceList()
+        public async Task<List<ListSelectDeviceQuery>> GetDeviceList()
         {
             return await _deviceService.GetDeviceList();
         }

BPA.SAAS.Manage.Application/Device/Interface/IDeviceService.cs

@@ -12,7 +12,7 @@ namespace BPA.SAAS.Manage.Application.Device.Interface
     public interface IDeviceService
     {
         Task<PageUtil> GetDeviceInfoPage(DeviceQueryInputDto inputDto);
-        Task<List<ListSelectQuery>> GetDeviceList();
+        Task<List<ListSelectDeviceQuery>> GetDeviceList();
         Task<bool> AddDevice(DeviceInfoBaseDto inputDto);
         Task<bool> UpdateDevice(DeviceInfoBaseDto inputDto);
         Task<bool> DelDeviceInfo(List<string> inputList);

BPA.SAAS.Manage.Application/Device/Services/DeviceService.cs

@@ -62,15 +62,16 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         /// 查询设备列表
         /// </summary>
         /// <returns></returns>
-        public async Task<List<ListSelectQuery>> GetDeviceList()
+        public async Task<List<ListSelectDeviceQuery>> GetDeviceList()
         {
             RefAsync<int> total = 0;
             var data = await _db.Queryable<BPA_DeviceInfo>()
-               .Select(a=> new ListSelectQuery
+               .Select(a=> new ListSelectDeviceQuery
                {
                    Id = a.Id,
                    Name = a.DeviceName,
-                   AutoKey=a.AutoKey.ToString()
+                   AutoKey=a.AutoKey.ToString(),
+                   Vesion=SqlFunc.Subqueryable<BPA_ProductVesion>().Where(x=>x.Id==a.ProductVersionId).First().Vesion,
                }) .ToListAsync();
             return data;
         }

BPA.SAAS.Manage.Comm/Model/ListSelectQuery.cs

@@ -12,4 +12,11 @@ namespace BPA.SAAS.Manage.Comm.Model
         public string Name { get; set; }
         public string AutoKey { get; set; }
     }
+    public class ListSelectDeviceQuery
+    {
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public string AutoKey { get; set; }
+        public string Vesion { get; set; }
+    }
 }