diff --git a/Cis.Application/Cb/Service/CbCameraParamsService.cs b/Cis.Application/Cb/Service/CbCameraParamsService.cs index 30a82da..f5627b9 100644 --- a/Cis.Application/Cb/Service/CbCameraParamsService.cs +++ b/Cis.Application/Cb/Service/CbCameraParamsService.cs @@ -16,7 +16,34 @@ public class CbCameraParamsService : ServiceBase, ITransient /// /// /// - /// equal:cameraType; like:name; between:[startTime,endTime]; + /// equal:cameraType,isDelete; like:name; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.ToString())); + if (queryObj.TryGetValue("cameraType", StringComparison.OrdinalIgnoreCase, out JToken cameraType)) + exp.And(it => it.CameraType.Equals(cameraType)); + 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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:cameraType,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson = "") @@ -28,6 +55,8 @@ public class CbCameraParamsService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("cameraType", StringComparison.OrdinalIgnoreCase, out JToken cameraType)) exp.And(it => it.CameraType.Equals(cameraType)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -41,7 +70,7 @@ public class CbCameraParamsService : ServiceBase, ITransient /// /// /// - /// equal:cameraType; like:name; between:[startTime,endTime]; + /// equal:cameraType,isDelete; like:name; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -55,6 +84,8 @@ public class CbCameraParamsService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("cameraType", StringComparison.OrdinalIgnoreCase, out JToken cameraType)) exp.And(it => it.CameraType.Equals(cameraType)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Application/Cb/Service/CbCameraService.cs b/Cis.Application/Cb/Service/CbCameraService.cs index 109a953..aef4d1b 100644 --- a/Cis.Application/Cb/Service/CbCameraService.cs +++ b/Cis.Application/Cb/Service/CbCameraService.cs @@ -16,7 +16,36 @@ public class CbCameraService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraParamsId; like:ip,name; between:[startTime,endTime]; + /// equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + if (queryObj.TryGetValue("cbCameraParamsId", StringComparison.OrdinalIgnoreCase, out JToken cbCameraParamsId)) + exp.And(it => it.CbCameraParamsId.Equals(cbCameraParamsId)); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.ToString())); + if (queryObj.TryGetValue("ip", StringComparison.OrdinalIgnoreCase, out JToken ip)) + exp.And(it => it.Ip.Contains(ip.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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson = "") @@ -30,6 +59,8 @@ public class CbCameraService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("ip", StringComparison.OrdinalIgnoreCase, out JToken ip)) exp.And(it => it.Ip.Contains(ip.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -43,7 +74,7 @@ public class CbCameraService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraParamsId; like:ip,name; between:[startTime,endTime]; + /// equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -59,6 +90,8 @@ public class CbCameraService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("ip", StringComparison.OrdinalIgnoreCase, out JToken ip)) exp.And(it => it.Ip.Contains(ip.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Application/Cis.Application.xml b/Cis.Application/Cis.Application.xml index 0910e50..d799680 100644 --- a/Cis.Application/Cis.Application.xml +++ b/Cis.Application/Cis.Application.xml @@ -114,18 +114,25 @@ 相机参数服务 + + + + + equal:cameraType,isDelete; like:name; between:[startTime,endTime]; + + - equal:cameraType; like:name; between:[startTime,endTime]; + equal:cameraType,isDelete; like:name; between:[startTime,endTime]; - equal:cameraType; like:name; between:[startTime,endTime]; + equal:cameraType,isDelete; like:name; between:[startTime,endTime]; index,size @@ -134,18 +141,25 @@ 相机服务 + + + + + equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; + + - equal:cbCameraParamsId; like:ip,name; between:[startTime,endTime]; + equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; - equal:cbCameraParamsId; like:ip,name; between:[startTime,endTime]; + equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; index,size @@ -274,18 +288,25 @@ 标记分组服务 + + + + + equal:isDelete; like:name; between:[startTime,endTime]; + + - like:name; between:[startTime,endTime]; + equal:isDelete; like:name; between:[startTime,endTime]; - like:name; between:[startTime,endTime]; + equal:isDelete; like:name; between:[startTime,endTime]; index,size @@ -294,18 +315,25 @@ 标签服务 + + + + + equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; + + - equal:cbCameraId,cmMarkGroupId; like:name; between:[startTime,endTime]; + equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; - equal:cbCameraId,cmMarkGroupId; like:name; between:[startTime,endTime]; + equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; index,size @@ -961,18 +989,25 @@ 系统字典值服务 + + + + + equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + + - equal:sysDictTypeId; like:code; between:[startTime,endTime]; + equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; - equal:sysDictTypeId; like:code; between:[startTime,endTime]; + equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; index,size @@ -981,18 +1016,25 @@ 系统字典类型服务 + + + + + equal:code,isDelete; like:name; between:[startTime,endTime]; + + - equal:code; like:name; between:[startTime,endTime]; + equal:code,isDelete; like:name; between:[startTime,endTime]; - equal:code; like:name; between:[startTime,endTime]; + equal:code,isDelete; like:name; between:[startTime,endTime]; index,size diff --git a/Cis.Application/Cm/Service/CmMarkGroupService.cs b/Cis.Application/Cm/Service/CmMarkGroupService.cs index cbc8607..9594128 100644 --- a/Cis.Application/Cm/Service/CmMarkGroupService.cs +++ b/Cis.Application/Cm/Service/CmMarkGroupService.cs @@ -16,7 +16,32 @@ public class CmMarkGroupService : ServiceBase, ITransient /// /// /// - /// like:name; between:[startTime,endTime]; + /// equal:isDelete; like:name; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson) @@ -26,6 +51,8 @@ public class CmMarkGroupService : ServiceBase, ITransient var exp = Expressionable.Create(); if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) exp.And(it => it.Name.Contains(name.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -39,7 +66,7 @@ public class CmMarkGroupService : ServiceBase, ITransient /// /// /// - /// like:name; between:[startTime,endTime]; + /// equal:isDelete; like:name; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -51,6 +78,8 @@ public class CmMarkGroupService : ServiceBase, ITransient var exp = Expressionable.Create(); if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) exp.And(it => it.Name.Contains(name.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Application/Cm/Service/CmMarkLabelService.cs b/Cis.Application/Cm/Service/CmMarkLabelService.cs index 200f2b9..f465f2c 100644 --- a/Cis.Application/Cm/Service/CmMarkLabelService.cs +++ b/Cis.Application/Cm/Service/CmMarkLabelService.cs @@ -44,7 +44,36 @@ public class CmMarkLabelService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraId,cmMarkGroupId; like:name; between:[startTime,endTime]; + /// equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + if (queryObj.TryGetValue("cbCameraId", StringComparison.OrdinalIgnoreCase, out JToken cbCameraId)) + exp.And(it => it.CbCameraId.Equals(cbCameraId)); + if (queryObj.TryGetValue("cmMarkGroupId", StringComparison.OrdinalIgnoreCase, out JToken cmMarkGroupId)) + exp.And(it => it.CmMarkGroupId.Equals(cmMarkGroupId)); + if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) + exp.And(it => it.Name.Contains(name.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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson = "") @@ -58,6 +87,8 @@ public class CmMarkLabelService : ServiceBase, ITransient exp.And(it => it.CmMarkGroupId.Equals(cmMarkGroupId)); if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) exp.And(it => it.Name.Contains(name.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -71,7 +102,7 @@ public class CmMarkLabelService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraId,cmMarkGroupId; like:name; between:[startTime,endTime]; + /// equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -87,6 +118,8 @@ public class CmMarkLabelService : ServiceBase, ITransient exp.And(it => it.CmMarkGroupId.Equals(cmMarkGroupId)); if (queryObj.TryGetValue("name", StringComparison.OrdinalIgnoreCase, out JToken name)) exp.And(it => it.Name.Contains(name.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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Application/Sys/Service/SysDictDataService.cs b/Cis.Application/Sys/Service/SysDictDataService.cs index a24fcdd..c494733 100644 --- a/Cis.Application/Sys/Service/SysDictDataService.cs +++ b/Cis.Application/Sys/Service/SysDictDataService.cs @@ -16,7 +16,34 @@ public class SysDictDataService : ServiceBase, ITransient /// /// /// - /// equal:sysDictTypeId; like:code; between:[startTime,endTime]; + /// equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + 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("code", StringComparison.OrdinalIgnoreCase, out JToken code)) + exp.And(it => it.Code.Equals(code)); + 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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson) @@ -28,6 +55,8 @@ public class SysDictDataService : ServiceBase, ITransient exp.And(it => it.SysDictTypeId.Equals(sysDictTypeId)); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) exp.And(it => it.Code.Equals(code)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -41,7 +70,7 @@ public class SysDictDataService : ServiceBase, ITransient /// /// /// - /// equal:sysDictTypeId; like:code; between:[startTime,endTime]; + /// equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -55,6 +84,8 @@ public class SysDictDataService : ServiceBase, ITransient exp.And(it => it.SysDictTypeId.Equals(sysDictTypeId)); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) exp.And(it => it.Code.Equals(code)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Application/Sys/Service/SysDictTypeService.cs b/Cis.Application/Sys/Service/SysDictTypeService.cs index c961216..b410d84 100644 --- a/Cis.Application/Sys/Service/SysDictTypeService.cs +++ b/Cis.Application/Sys/Service/SysDictTypeService.cs @@ -16,7 +16,34 @@ public class SysDictTypeService : ServiceBase, ITransient /// /// /// - /// equal:code; like:name; between:[startTime,endTime]; + /// equal:code,isDelete; like:name; between:[startTime,endTime]; + /// + [HttpGet] + public override async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + 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)); + 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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:code,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task> GetList(string queryJson) @@ -28,6 +55,8 @@ public class SysDictTypeService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) exp.And(it => it.Code.Equals(code)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -41,7 +70,7 @@ public class SysDictTypeService : ServiceBase, ITransient /// /// /// - /// equal:code; like:name; between:[startTime,endTime]; + /// equal:code,isDelete; like:name; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -55,6 +84,8 @@ public class SysDictTypeService : ServiceBase, ITransient exp.And(it => it.Name.Contains(name.ToString())); if (queryObj.TryGetValue("code", StringComparison.OrdinalIgnoreCase, out JToken code)) exp.And(it => it.Code.Equals(code)); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); diff --git a/Cis.Core/Cis.Core.xml b/Cis.Core/Cis.Core.xml index b3a18db..6652a34 100644 --- a/Cis.Core/Cis.Core.xml +++ b/Cis.Core/Cis.Core.xml @@ -257,18 +257,25 @@ + + + + + equal:isDelete; between:[startTime,endTime]; + + - between:[startTime,endTime]; + equal:isDelete; between:[startTime,endTime]; - between:[startTime,endTime]; + equal:isDelete; between:[startTime,endTime]; index,size diff --git a/Cis.Core/Common/Entity/ServiceBase.cs b/Cis.Core/Common/Entity/ServiceBase.cs index 1964d77..d48d2c8 100644 --- a/Cis.Core/Common/Entity/ServiceBase.cs +++ b/Cis.Core/Common/Entity/ServiceBase.cs @@ -100,10 +100,8 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() [HttpPost] public virtual async Task FakeDelete(long id) { - return await _baseRep.AsUpdateable() - .Where(it => it.Id.Equals(id)) - .Where("limit 1") - .ReSetValue(it => it.IsDelete = true) + return await _baseRep.AsUpdateable(new T { Id = id, IsDelete = true }) + .UpdateColumns(it => it.IsDelete) .ExecuteCommandAsync() > 0; } @@ -122,7 +120,30 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() /// /// /// - /// between:[startTime,endTime]; + /// equal:isDelete; between:[startTime,endTime]; + /// + [HttpGet] + public virtual async Task GetQ(string queryJson) + { + JObject queryObj = queryJson.ToJObject(); + + var exp = Expressionable.Create(); + 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) + && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) + exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); + + var entity = await _baseRep.AsQueryable() + .Where(exp.ToExpression()) + .FirstAsync(); + return entity; + } + + /// + /// + /// + /// equal:isDelete; between:[startTime,endTime]; /// [HttpGet] public virtual async Task> GetList(string queryJson = "") @@ -130,6 +151,8 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime()); @@ -143,7 +166,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() /// /// /// - /// between:[startTime,endTime]; + /// equal:isDelete; between:[startTime,endTime]; /// index,size /// [HttpGet] @@ -153,6 +176,8 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() Pagination pageObj = pagination.ToObject(); var exp = Expressionable.Create(); + 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) && queryObj.TryGetValue("EndTime", StringComparison.OrdinalIgnoreCase, out JToken endTime)) exp.And(it => it.CreateTime >= startTime.ToDateTime() && it.CreateTime <= endTime.ToDateTime());