查询修改

OpenAuth.App/ServiceApp/AirportMaintenanceApp.cs

@@ -372,18 +372,20 @@ namespace OpenAuth.App.ServiceApp
             }
         }
         #endregion
-        public async Task<Response<PageInfo<List<LasaMediaFile>>>> GetMediaFile(string device, string picname, DateTime? startTime, DateTime? endTime, int page, int limit)
+        public async Task<Response<PageInfo<List<LasaMediaFile>>>> GetMediaFile(string device, string picname, DateTime? startTime, DateTime? endTime, int page, int limit, int level, string parentKey)
         {
             RefAsync<int> totalCount = 0;
             using (var db = UnitWork.CreateContext())
             {
                 Console.WriteLine(startTime.ToString());
                 var list = await db.LasaMediaFile.AsQueryable()
-                      
-                     .WhereIF(!string.IsNullOrEmpty(device),x =>  x.DroneModelKey == device)
+
+                     .WhereIF(!string.IsNullOrEmpty(device), x => x.DroneModelKey == device)
                      .WhereIF(!string.IsNullOrEmpty(picname), x => x.Name.Contains(picname))
-                     .WhereIF("0001/1/1 0:00:00".Equal(startTime.ToString() ), x => x.CreateTime >= startTime)
-                     .WhereIF("0001/1/1 0:00:00".Equal(endTime.ToString()), x => x.CreateTime <= endTime)
+                     .WhereIF(!"0001/1/1 0:00:00".Equal(startTime.ToString()), x => x.CreateTime >= startTime)
+                     .WhereIF(!"0001/1/1 0:00:00".Equal(endTime.ToString()), x => x.CreateTime <= endTime)
+                     .WhereIF(level >= 0, x => x.Level == level)
+                     .WhereIF(!string.IsNullOrEmpty(parentKey), x => x.ParentKey == parentKey)
                      .OrderBy(x => x.CreateTime, OrderByType.Asc)
                     .ToPageListAsync(page, limit, totalCount);
                 return new Response<PageInfo<List<LasaMediaFile>>>

OpenAuth.Repository/Domain/LasaMediaFile.cs

@@ -87,4 +87,15 @@ public class LasaMediaFile
     public DateTime? CreateTime { get; set; }
     
     public string TaskId { get; set; }
+
+    public int? ShowOnMap { get; set; }
+
+    public int? display { get; set; }
+
+    public int? Level { get; set; }
+
+
+    public string ParentKey { get; set; }
+    
+
 }

OpenAuth.WebApi/Controllers/ServiceControllers/AirportMaintenanceController.cs

@@ -661,12 +661,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
 
         [HttpGet]
         [AllowAnonymous]
-        public async Task<Response<PageInfo<List<LasaMediaFile>>>> GetMediaFile(string device, string picname, DateTime startTime, DateTime endTime, int page, int limit)
+        public async Task<Response<PageInfo<List<LasaMediaFile>>>> GetMediaFile(string device,string picname, DateTime startTime, DateTime endTime, int page, int limit,int level,string parentKey)
         {
             var result = new Response<PageInfo<List<LasaMediaFile>>>();
             try
             {
-                result = await _app.GetMediaFile(device, picname, startTime, endTime, page, limit);
+                result = await _app.GetMediaFile(device, picname,startTime, endTime, page, limit, level,parentKey);
             }
             catch (Exception ex)
             {