查询修改
parent
7926cff28a
commit
9a829b861a
|
|
@ -372,7 +372,7 @@ namespace OpenAuth.App.ServiceApp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#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;
|
RefAsync<int> totalCount = 0;
|
||||||
using (var db = UnitWork.CreateContext())
|
using (var db = UnitWork.CreateContext())
|
||||||
|
|
@ -382,8 +382,10 @@ namespace OpenAuth.App.ServiceApp
|
||||||
|
|
||||||
.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(!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(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(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)
|
.OrderBy(x => x.CreateTime, OrderByType.Asc)
|
||||||
.ToPageListAsync(page, limit, totalCount);
|
.ToPageListAsync(page, limit, totalCount);
|
||||||
return new Response<PageInfo<List<LasaMediaFile>>>
|
return new Response<PageInfo<List<LasaMediaFile>>>
|
||||||
|
|
|
||||||
|
|
@ -87,4 +87,15 @@ public class LasaMediaFile
|
||||||
public DateTime? CreateTime { get; set; }
|
public DateTime? CreateTime { get; set; }
|
||||||
|
|
||||||
public string TaskId { 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; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -661,12 +661,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[AllowAnonymous]
|
[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>>>();
|
var result = new Response<PageInfo<List<LasaMediaFile>>>();
|
||||||
try
|
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)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue