From b57277341bc4d0859b9d8426a288da1ed5ffc5a0 Mon Sep 17 00:00:00 2001 From: fajiao <1519100073@qq.com> Date: Thu, 8 Dec 2022 17:17:49 +0800 Subject: [PATCH] =?UTF-8?q?advance:=20=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cb/Service/CbCameraParamsService.cs | 3 +++ Cis.Application/Cb/Service/CbCameraService.cs | 10 +++++-- Cis.Application/Cis.Application.xml | 6 ++--- .../Cm/Service/CmMarkGroupService.cs | 3 +++ .../Cm/Service/CmMarkLabelService.cs | 5 +++- .../Sys/Service/SysDictDataService.cs | 27 ++++++++++++------- .../Sys/Service/SysDictTypeService.cs | 12 +++++---- Cis.Core/Common/Entity/ServiceBase.cs | 5 +++- 8 files changed, 50 insertions(+), 21 deletions(-) diff --git a/Cis.Application/Cb/Service/CbCameraParamsService.cs b/Cis.Application/Cb/Service/CbCameraParamsService.cs index 8fe4161..117f402 100644 --- a/Cis.Application/Cb/Service/CbCameraParamsService.cs +++ b/Cis.Application/Cb/Service/CbCameraParamsService.cs @@ -40,6 +40,7 @@ public class CbCameraParamsService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .FirstAsync(); return entity; } @@ -69,6 +70,7 @@ public class CbCameraParamsService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToListAsync(); return list; } @@ -100,6 +102,7 @@ public class CbCameraParamsService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } diff --git a/Cis.Application/Cb/Service/CbCameraService.cs b/Cis.Application/Cb/Service/CbCameraService.cs index 46adf43..839fcd7 100644 --- a/Cis.Application/Cb/Service/CbCameraService.cs +++ b/Cis.Application/Cb/Service/CbCameraService.cs @@ -43,6 +43,7 @@ public class CbCameraService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .FirstAsync(); return entity; } @@ -72,6 +73,7 @@ public class CbCameraService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToListAsync(); return list; } @@ -85,8 +87,8 @@ public class CbCameraService : ServiceBase, ITransient [HttpGet] public override async Task> GetPageList([Required] string pagination, string queryJson = "") { - JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); + JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); if (queryObj.TryGetValue("cbCameraParamsId", StringComparison.OrdinalIgnoreCase, out JToken cbCameraParamsId)) @@ -103,6 +105,7 @@ public class CbCameraService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } @@ -118,7 +121,7 @@ public class CbCameraService : ServiceBase, ITransient public async Task GetBO([Required] long id) { CbCamera camera = await _baseRep.GetByIdAsync(id); - if (camera == null) return null; + if (camera == null || camera.IsDelete) return null; CbCameraParams cameraParams = await _cbCameraParamsRep.GetByIdAsync(camera.CbCameraParamsId); if (cameraParams == null) return null; CbCameraBO bo = CbCameraBO.New(camera, cameraParams); @@ -143,11 +146,14 @@ public class CbCameraService : ServiceBase, ITransient exp.And(it => it.Ip.Contains(ip.ToString())); if (queryObj.TryGetValue("IsDelete", StringComparison.OrdinalIgnoreCase, out JToken isDelete)) exp.And(it => it.IsDelete.Equals(isDelete)); + else + exp.And(it => it.IsDelete.Equals(false)); if (queryObj.TryGetValue("StartTime", StringComparison.OrdinalIgnoreCase, out JToken startTime) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); List cameraList = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToListAsync(); HashSet paramsIdSet = new(); diff --git a/Cis.Application/Cis.Application.xml b/Cis.Application/Cis.Application.xml index 11e5f0c..8d6cc96 100644 --- a/Cis.Application/Cis.Application.xml +++ b/Cis.Application/Cis.Application.xml @@ -1317,21 +1317,21 @@ 获取实体类 - equal:sysDictTypeId,code,id,isDelete; between:[startTime,endTime]; + equal:sysDictTypeId,id,isDelete; like:name,code; between:[startTime,endTime]; 批量获取实体类 - equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + equal:sysDictTypeId,isDelete; like:name,code; between:[startTime,endTime]; 批量获取分页实体类 - equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + equal:sysDictTypeId,isDelete; like:name,code; between:[startTime,endTime]; index,size diff --git a/Cis.Application/Cm/Service/CmMarkGroupService.cs b/Cis.Application/Cm/Service/CmMarkGroupService.cs index ba9395b..3dae987 100644 --- a/Cis.Application/Cm/Service/CmMarkGroupService.cs +++ b/Cis.Application/Cm/Service/CmMarkGroupService.cs @@ -34,6 +34,7 @@ public class CmMarkGroupService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .FirstAsync(); return entity; } @@ -61,6 +62,7 @@ public class CmMarkGroupService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .ToListAsync(); return list; } @@ -88,6 +90,7 @@ public class CmMarkGroupService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } diff --git a/Cis.Application/Cm/Service/CmMarkLabelService.cs b/Cis.Application/Cm/Service/CmMarkLabelService.cs index 9e2b73a..3fb0a2c 100644 --- a/Cis.Application/Cm/Service/CmMarkLabelService.cs +++ b/Cis.Application/Cm/Service/CmMarkLabelService.cs @@ -95,6 +95,7 @@ public class CmMarkLabelService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .FirstAsync(); return entity; } @@ -126,6 +127,7 @@ public class CmMarkLabelService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToListAsync(); return list; } @@ -139,8 +141,8 @@ public class CmMarkLabelService : ServiceBase, ITransient [HttpGet] public override async Task> GetPageList([Required] string pagination, string queryJson = "") { - JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); + JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); if (queryObj.TryGetValue("cbCameraId", StringComparison.OrdinalIgnoreCase, out JToken cbCameraId)) @@ -157,6 +159,7 @@ public class CmMarkLabelService : ServiceBase, ITransient var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } diff --git a/Cis.Application/Sys/Service/SysDictDataService.cs b/Cis.Application/Sys/Service/SysDictDataService.cs index dea558e..8a8e39c 100644 --- a/Cis.Application/Sys/Service/SysDictDataService.cs +++ b/Cis.Application/Sys/Service/SysDictDataService.cs @@ -16,7 +16,7 @@ public class SysDictDataService : ServiceBase, ITransient /// /// 获取实体类 /// - /// equal:sysDictTypeId,code,id,isDelete; between:[startTime,endTime]; + /// equal:sysDictTypeId,id,isDelete; like:name,code; between:[startTime,endTime]; /// [HttpGet] public override async Task GetByQ([Required] string queryJson) @@ -28,8 +28,10 @@ public class SysDictDataService : ServiceBase, ITransient exp.And(it => it.SysDictTypeId.Equals(sysDictTypeId)); if (queryObj.TryGetValue("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) exp.And(it => it.Id.Equals(Id)); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) - exp.And(it => it.Code.Equals(code)); + exp.And(it => it.Code.Contains(code.ToString())); if (queryObj.TryGetValue("IsDelete", StringComparison.OrdinalIgnoreCase, out JToken isDelete)) exp.And(it => it.IsDelete.Equals(isDelete)); if (queryObj.TryGetValue("StartTime", StringComparison.OrdinalIgnoreCase, out JToken startTime) @@ -38,6 +40,7 @@ public class SysDictDataService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => new { it.SysDictTypeId, it.Order }) .FirstAsync(); return entity; } @@ -45,7 +48,7 @@ public class SysDictDataService : ServiceBase, ITransient /// /// 批量获取实体类 /// - /// equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + /// equal:sysDictTypeId,isDelete; like:name,code; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson = "") @@ -55,8 +58,10 @@ public class SysDictDataService : ServiceBase, ITransient var exp = Expressionable.Create(); if (queryObj.TryGetValue("sysDictTypeId", StringComparison.OrdinalIgnoreCase, out JToken sysDictTypeId)) exp.And(it => it.SysDictTypeId.Equals(sysDictTypeId)); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) - exp.And(it => it.Code.Equals(code)); + exp.And(it => it.Code.Contains(code.ToString())); if (queryObj.TryGetValue("IsDelete", StringComparison.OrdinalIgnoreCase, out JToken isDelete)) exp.And(it => it.IsDelete.Equals(isDelete)); if (queryObj.TryGetValue("StartTime", StringComparison.OrdinalIgnoreCase, out JToken startTime) @@ -64,7 +69,8 @@ public class SysDictDataService : ServiceBase, ITransient exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); var list = await _baseRep.AsQueryable() - .Where(exp.ToExpression()).OrderBy(it => it.Order) + .Where(exp.ToExpression()) + .OrderBy(it => new { it.SysDictTypeId, it.Order }) .ToListAsync(); return list; } @@ -72,20 +78,22 @@ public class SysDictDataService : ServiceBase, ITransient /// /// 批量获取分页实体类 /// - /// equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + /// equal:sysDictTypeId,isDelete; like:name,code; between:[startTime,endTime]; /// index,size /// [HttpGet] public override async Task> GetPageList([Required] string pagination, string queryJson = "") { - JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); + JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); if (queryObj.TryGetValue("sysDictTypeId", StringComparison.OrdinalIgnoreCase, out JToken sysDictTypeId)) exp.And(it => it.SysDictTypeId.Equals(sysDictTypeId)); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) - exp.And(it => it.Code.Equals(code)); + exp.And(it => it.Code.Contains(code.ToString())); if (queryObj.TryGetValue("IsDelete", StringComparison.OrdinalIgnoreCase, out JToken isDelete)) exp.And(it => it.IsDelete.Equals(isDelete)); if (queryObj.TryGetValue("StartTime", StringComparison.OrdinalIgnoreCase, out JToken startTime) @@ -93,7 +101,8 @@ public class SysDictDataService : ServiceBase, ITransient exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); var list = await _baseRep.AsQueryable() - .Where(exp.ToExpression()).OrderBy(it => it.Order) + .Where(exp.ToExpression()) + .OrderBy(it => new { it.SysDictTypeId, it.Order }) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } diff --git a/Cis.Application/Sys/Service/SysDictTypeService.cs b/Cis.Application/Sys/Service/SysDictTypeService.cs index d835fd8..76c0b40 100644 --- a/Cis.Application/Sys/Service/SysDictTypeService.cs +++ b/Cis.Application/Sys/Service/SysDictTypeService.cs @@ -41,6 +41,7 @@ public class SysDictTypeService : ServiceBase, ITransient var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .FirstAsync(); return entity; } @@ -67,7 +68,8 @@ public class SysDictTypeService : ServiceBase, ITransient exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); var list = await _baseRep.AsQueryable() - .Where(exp.ToExpression()).OrderBy(it => it.Order) + .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .ToListAsync(); return list; } @@ -81,8 +83,8 @@ public class SysDictTypeService : ServiceBase, ITransient [HttpGet] public override async Task> GetPageList([Required] string pagination, string queryJson = "") { - JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); + JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) @@ -96,7 +98,8 @@ public class SysDictTypeService : ServiceBase, ITransient exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); var list = await _baseRep.AsQueryable() - .Where(exp.ToExpression()).OrderBy(it => it.Order) + .Where(exp.ToExpression()) + .OrderBy(it => it.Order) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; } @@ -114,12 +117,11 @@ public class SysDictTypeService : ServiceBase, ITransient SysDictType type = await _baseRep.AsQueryable() .Where(it => it.Code.Equals(code)) .FirstAsync(); - if (type == null) return null; + if (type == null || type.IsDelete) return null; List dataList = await _sysDictDataRep.AsQueryable() .Where(it => it.SysDictTypeId.Equals(type.Id)) .OrderBy(it => it.Order) .ToListAsync(); - SysDictTypeBO bo = SysDictTypeBO.New(type, dataList); return bo; } diff --git a/Cis.Core/Common/Entity/ServiceBase.cs b/Cis.Core/Common/Entity/ServiceBase.cs index f151b77..2072ab5 100644 --- a/Cis.Core/Common/Entity/ServiceBase.cs +++ b/Cis.Core/Common/Entity/ServiceBase.cs @@ -140,6 +140,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() var entity = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .FirstAsync(); return entity; } @@ -163,6 +164,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToListAsync(); return list; } @@ -176,8 +178,8 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() [HttpGet] public virtual async Task> GetPageList([Required] string pagination, string queryJson = "") { - JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); + JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); if (queryObj.TryGetValue("IsDelete", StringComparison.OrdinalIgnoreCase, out JToken isDelete)) @@ -188,6 +190,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() var list = await _baseRep.AsQueryable() .Where(exp.ToExpression()) + .OrderBy(it => it.CreateTime) .ToPageListAsync(pageObj.Index, pageObj.Size); return list; }