HC_YFZX
/
LASAPlatform
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备信息过滤

feature-flyModify
zhangbin 2025-07-15 09:01:48 +08:00
parent dc1be56dc3
commit 755a1339ad
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenAuth.App/ServiceApp/ManageApp.cs
View File

@ -51,14 +51,16 @@ namespace OpenAuth.App.ServiceApp
/// <param name="pageSize"></param>
/// <param name="key"></param>
/// <returns></returns>
public async Task<Response<PageInfo<List<LasaDronePort>>>> GetPageList(int page, int limit, string key)
public async Task<Response<PageInfo<List<LasaDronePort>>>> GetPageList(int page, int limit, string sn, string type, string workspaceid)
{
RefAsync<int> totalCount = 0;
using (var db = UnitWork.CreateContext())
{
var list = await db.LasaDronePort.AsQueryable().Includes(a => a.UavList)
.Where(a => a.IsDelete == false)
.WhereIF(!string.IsNullOrEmpty(key), a => a.Name.Contains(key))
.WhereIF(!string.IsNullOrEmpty(sn), a => a.Sn.Contains(sn))
.WhereIF(!string.IsNullOrEmpty(type), a => a.TypeId.Contains(type))
.WhereIF(!string.IsNullOrEmpty(workspaceid), a => a.WorkSpaceId.Contains(workspaceid))
.ToPageListAsync(page, limit, totalCount);
return new Response<PageInfo<List<LasaDronePort>>>
{
@ -148,7 +150,7 @@ namespace OpenAuth.App.ServiceApp
/// <param name="limit"></param>
/// <param name="key"></param>
/// <returns></returns>
public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string key)
public async Task<Response<PageInfo<List<dynamic>>>> GetUavPageList(int page, int limit, string sn, string type, string workspaceid)
{
RefAsync<int> totalCount = 0;
using (var db = UnitWork.CreateContext())
@ -156,7 +158,9 @@ namespace OpenAuth.App.ServiceApp
var list = await db.LasaUav.AsQueryable()
.LeftJoin<LasaDronePort>((a, b) => a.PId == b.Id)
.Where((a, b) => a.IsDelete == false)
.WhereIF(!string.IsNullOrEmpty(key), (a, b) => a.Name.Contains(key))
.WhereIF(!string.IsNullOrEmpty(sn), (a, b) => a.Sn.Contains(sn))
.WhereIF(!string.IsNullOrEmpty(type), (a, b) => a.TypeId.Contains(type))
.WhereIF(!string.IsNullOrEmpty(workspaceid), (a, b) => a.WorkSpaceId.Contains(workspaceid))
.Select<dynamic>((a, b) => new
{
id = a.Id,
@ -504,7 +508,7 @@ namespace OpenAuth.App.ServiceApp
}
var list = await db.LasaWorkspace.AsQueryable()
.Where(a=>a.IsDelete==false)
.Where(a => a.IsDelete == false)
.WhereIF(!string.IsNullOrEmpty(key), a => a.WorkspaceName.Contains(key))
.WhereIF(state != 0, a => a.Sate == state)
.WhereIF(isjoin == 1, a => ids.Contains(a.Id))