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

OpenAuth.App/ServiceApp/AirLine/Request/AirLineListRequestPage.cs

@@ -0,0 +1,23 @@
+using OpenAuth.App.Request;
+
+namespace OpenAuth.App.ServiceApp.AirLine.Request;
+
+public class AirLineListRequestPage : PageReq
+{
+    public bool Ascending { get; set; }
+
+    /// <summary>
+    ///无人机型号
+    /// </summary>
+    public string UavTypeId { get; set; }
+
+    /// <summary>
+    /// 航线类型
+    /// </summary>
+    public string AirLineType { get; set; }
+
+    /// <summary>
+    /// 航线名称
+    /// </summary>
+    public string AirLineName { get; set; }
+}

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -21,6 +21,7 @@ using System.Dynamic;
 using System.Text;
 using NPOI.HSSF.Record;
 using OpenAuth.App.Request;
+using OpenAuth.App.ServiceApp.AirLine.Request;
 
 namespace OpenAuth.App.ServiceApp
 {
@@ -452,14 +453,18 @@ namespace OpenAuth.App.ServiceApp
         /// <param name="limit"></param>
         /// <param name="key"></param>
         /// <returns></returns>
-        public async Task<Response<PageInfo<List<LasaAirLine>>>> GetAirLinePageList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<LasaAirLine>>>> GetAirLinePageList(AirLineListRequestPage req)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
             {
-                var list = await db.LasaAirLine.AsQueryable()
-                    .WhereIF(!string.IsNullOrEmpty(key), a => a.AirLineName.Contains(key))
-                    .ToPageListAsync(page, limit, totalCount);
+                var list = await db.LasaAirLine.AsQueryable().LeftJoin<LasaUav>((a, b) => a.UavId == b.Id)
+                    .WhereIF(!string.IsNullOrEmpty(req.UavTypeId),(a,b) => b.TypeId == req.UavTypeId)
+                    .WhereIF(!string.IsNullOrEmpty(req.key), a => a.AirLineName.Contains(req.key))
+                    .WhereIF(!string.IsNullOrEmpty(req.AirLineName), a => a.AirLineName.Contains(req.AirLineName))
+                    .WhereIF(!string.IsNullOrEmpty(req.AirLineType), a => a.AirLineType.Equals(req.AirLineType))
+                    .OrderByIF(true, a => a.CreateTime, req.Ascending ? OrderByType.Asc : OrderByType.Desc)
+                    .ToPageListAsync(req.page, req.limit, totalCount);
                 return new Response<PageInfo<List<LasaAirLine>>>
                 {
                     Result = new PageInfo<List<LasaAirLine>> { Items = list, Total = totalCount }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using OpenAuth.App.ServiceApp;
+using OpenAuth.App.ServiceApp.AirLine.Request;
 using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.App.ServiceApp.Response;
 using OpenAuth.Repository.Domain;
@@ -43,7 +44,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="workspaceid">项目</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<LasaDronePort>>>> GetDataList(int page, int limit, string sn, string type, string workspaceid)
+        public async Task<Response<PageInfo<List<LasaDronePort>>>> GetDataList(int page, int limit, string sn,
+            string type, string workspaceid)
         {
             var result = new Response<PageInfo<List<LasaDronePort>>>();
             try
@@ -105,7 +107,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="workspaceid">项目</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string sn, string type, string workspaceid)
+        public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string sn, string type,
+            string workspaceid)
         {
             var result = new Response<PageInfo<List<dynamic>>>();
             try
@@ -152,6 +155,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.DeleteUav(id);
         }
+
         /// <summary>
         /// 根据机场sn获取无人机列表
         /// </summary>
@@ -175,6 +179,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
             return result;
         }
+
         /// <summary>
         /// 导出无人机信息
         /// </summary>
@@ -187,6 +192,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             string fileName = "DeviceSNList_" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
             return File(fileBytes, "text/plain", fileName);
         }
+
         #endregion
 
         #region 任务管理
@@ -199,12 +205,13 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="key"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,int? status)
+        public async Task<Response<PageInfo<List<LasaTask>>>> GetTaskPageList(int page, int limit, string key,
+            int? status)
         {
             var result = new Response<PageInfo<List<LasaTask>>>();
             try
             {
-                result = await _app.GetTaskPageList(page, limit, key,status);
+                result = await _app.GetTaskPageList(page, limit, key, status);
             }
             catch (Exception ex)
             {
@@ -226,17 +233,18 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         }
 
         /// <summary>
-        /// 编辑任务
+        /// 编辑任务,不再允许编辑任务
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [Obsolete]
         public async Task<Response<bool>> EditTask(LasaTask info)
         {
             return await _app.EditTask(info);
         }
 
         /// <summary>
-        /// 删除任务 只要未完成的都可删除吗？
+        /// 删除任务
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -257,12 +265,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// <param name="key"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<Response<PageInfo<List<LasaAirLine>>>> GetAirLineList(int page, int limit, string key)
+        public async Task<Response<PageInfo<List<LasaAirLine>>>> GetAirLineList([FromQuery] AirLineListRequestPage req)
         {
             var result = new Response<PageInfo<List<LasaAirLine>>>();
             try
             {
-                result = await _app.GetAirLinePageList(page, limit, key);
+                result = await _app.GetAirLinePageList(req);
             }
             catch (Exception ex)
             {
@@ -508,6 +516,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.GetTAskImageList(taskId);
         }
+
         /// <summary>
         /// 开启机场直播（测试使用）
         /// </summary>
@@ -519,6 +528,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.StartDronePortLive(streamUrl);
         }
+
         /// <summary>
         /// 测试使用
         /// </summary>
@@ -755,6 +765,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         #endregion
 
         #region 基本信息
+
         /// <summary>
         /// 获取基本信息
         /// </summary>
@@ -765,6 +776,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         {
             return await _app.GetBasicInfo();
         }
+
         #endregion
     }
 }