Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -309,17 +309,17 @@ namespace OpenAuth.App.ServiceApp
             }
         }
         //获取无人机信息
-        public async Task<Response<List<LasaUav>>> GetUavList()
+        public async Task<Response<List<LasaDronePort>>> GetUavList()
         {
             
             using (var db = UnitWork.CreateContext())
             {
                 var list=db.LasaSpaceDevice.AsQueryable()?.Select(r=>r.DeviceId).ToList();
                 
-                var uavlist = await db.LasaUav.AsQueryable()
+                var uavlist = await db.LasaDronePort.AsQueryable()
                     .Where(r=>!list.Contains(r.Id))
                     .ToListAsync();
-                return new Response<List<LasaUav>>
+                return new Response<List<LasaDronePort>>
                 {
                     Result=uavlist
                 };
@@ -341,13 +341,13 @@ namespace OpenAuth.App.ServiceApp
                     .LeftJoin<LasaSpaceUser>((r, a) => r.Id == a.UserId)
                     .Where((r, a) => a.WorkSpaceId == id)
                     .Select((r, a) => r).ToList();
-                var uav=db.LasaUav.AsQueryable()
+                var uav=db.LasaDronePort.AsQueryable()
                     .LeftJoin<LasaSpaceDevice>((r,a)=>r.Id==a.DeviceId)
                     .Where((r,a)=>a.WorkSpaceId==id)
                     .Select((r,a)=>r).ToList();
                 var lockfly=db.LasaSpaceLockFly.AsQueryable().Where(r=>r.WorkSpaceId==id).ToList();
                 res.users = sysuser;
-                res.lasaUavs = uav;
+                res.LasaDronePort = uav;
                 res.lasaSpaceLockFlies = lockfly;
                 res.workspace = workspace;
 

OpenAuth.App/ServiceApp/Response/WorkSpaceRes.cs

@@ -11,7 +11,7 @@ namespace OpenAuth.App.ServiceApp.Response
     {
         public LasaWorkspace workspace { get; set; }
         public List<SysUser> users { get; set; }
-        public List<LasaUav> lasaUavs { get; set; }
+        public List<LasaDronePort> LasaDronePort { get; set; }
         public List<LasaSpaceLockFly> lasaSpaceLockFlies { get; set; }
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -306,14 +306,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         }
 
         /// <summary>
-        /// 获取无人机列表，添加项目使用
+        /// 获取机场列表，添加项目使用
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<List<LasaUav>>> GetUavList()
+        public async Task<Response<List<LasaDronePort>>> GetUavList()
         {
-            var result = new Response<List<LasaUav>>();
+            var result = new Response<List<LasaDronePort>>();
             try
             {
                 result = await _app.GetUavList();