diff --git a/Cis.Application/Cb/Service/CbCameraParamsService.cs b/Cis.Application/Cb/Service/CbCameraParamsService.cs index f5627b9..604af32 100644 --- a/Cis.Application/Cb/Service/CbCameraParamsService.cs +++ b/Cis.Application/Cb/Service/CbCameraParamsService.cs @@ -16,7 +16,7 @@ public class CbCameraParamsService : ServiceBase, ITransient /// /// /// - /// equal:cameraType,isDelete; like:name; between:[startTime,endTime]; + /// equal:cameraType,id,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -28,6 +28,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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -74,7 +76,7 @@ public class CbCameraParamsService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson="") { Pagination pageObj = pagination.ToObject(); JObject queryObj = queryJson.ToJObject(); diff --git a/Cis.Application/Cb/Service/CbCameraService.cs b/Cis.Application/Cb/Service/CbCameraService.cs index aef4d1b..4686751 100644 --- a/Cis.Application/Cb/Service/CbCameraService.cs +++ b/Cis.Application/Cb/Service/CbCameraService.cs @@ -16,7 +16,7 @@ public class CbCameraService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; + /// equal:cbCameraParamsId,id,isDelete; like:ip,name; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -30,6 +30,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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -78,7 +80,7 @@ public class CbCameraService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson = "") { JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); diff --git a/Cis.Application/Cis.Application.xml b/Cis.Application/Cis.Application.xml index d799680..58bc696 100644 --- a/Cis.Application/Cis.Application.xml +++ b/Cis.Application/Cis.Application.xml @@ -118,7 +118,7 @@ - equal:cameraType,isDelete; like:name; between:[startTime,endTime]; + equal:cameraType,id,isDelete; like:name; between:[startTime,endTime]; @@ -145,7 +145,7 @@ - equal:cbCameraParamsId,isDelete; like:ip,name; between:[startTime,endTime]; + equal:cbCameraParamsId,id,isDelete; like:ip,name; between:[startTime,endTime]; @@ -292,7 +292,7 @@ - equal:isDelete; like:name; between:[startTime,endTime]; + equal:id,isDelete; like:name; between:[startTime,endTime]; @@ -319,7 +319,7 @@ - equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; + equal:cbCameraId,cmMarkGroupId,id,isDelete; like:name; between:[startTime,endTime]; @@ -993,7 +993,7 @@ - equal:sysDictTypeId,code,isDelete; between:[startTime,endTime]; + equal:sysDictTypeId,code,id,isDelete; between:[startTime,endTime]; @@ -1020,7 +1020,7 @@ - equal:code,isDelete; like:name; between:[startTime,endTime]; + equal:code,id,isDelete; like:name; between:[startTime,endTime]; diff --git a/Cis.Application/Cm/Service/CmMarkGroupService.cs b/Cis.Application/Cm/Service/CmMarkGroupService.cs index 9594128..eb8c082 100644 --- a/Cis.Application/Cm/Service/CmMarkGroupService.cs +++ b/Cis.Application/Cm/Service/CmMarkGroupService.cs @@ -16,7 +16,7 @@ public class CmMarkGroupService : ServiceBase, ITransient /// /// /// - /// equal:isDelete; like:name; between:[startTime,endTime]; + /// equal:id,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -51,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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -70,7 +72,7 @@ public class CmMarkGroupService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson="") { Pagination pageObj = pagination.ToObject(); JObject queryObj = queryJson.ToJObject(); diff --git a/Cis.Application/Cm/Service/CmMarkLabelService.cs b/Cis.Application/Cm/Service/CmMarkLabelService.cs index f465f2c..f3ff9e1 100644 --- a/Cis.Application/Cm/Service/CmMarkLabelService.cs +++ b/Cis.Application/Cm/Service/CmMarkLabelService.cs @@ -44,7 +44,7 @@ public class CmMarkLabelService : ServiceBase, ITransient /// /// /// - /// equal:cbCameraId,cmMarkGroupId,isDelete; like:name; between:[startTime,endTime]; + /// equal:cbCameraId,cmMarkGroupId,id,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -87,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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -106,7 +108,7 @@ public class CmMarkLabelService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson="") { JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); diff --git a/Cis.Application/Sys/Service/SysDictDataService.cs b/Cis.Application/Sys/Service/SysDictDataService.cs index c494733..3f7d3c0 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,isDelete; between:[startTime,endTime]; + /// equal:sysDictTypeId,code,id,isDelete; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -26,6 +26,8 @@ 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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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)) @@ -74,7 +76,7 @@ public class SysDictDataService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson = "") { JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); diff --git a/Cis.Application/Sys/Service/SysDictTypeService.cs b/Cis.Application/Sys/Service/SysDictTypeService.cs index b410d84..0ad3b8d 100644 --- a/Cis.Application/Sys/Service/SysDictTypeService.cs +++ b/Cis.Application/Sys/Service/SysDictTypeService.cs @@ -16,7 +16,7 @@ public class SysDictTypeService : ServiceBase, ITransient /// /// /// - /// equal:code,isDelete; like:name; between:[startTime,endTime]; + /// equal:code,id,isDelete; like:name; between:[startTime,endTime]; /// [HttpGet] public override async Task GetQ(string queryJson) @@ -28,6 +28,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("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -74,7 +76,7 @@ public class SysDictTypeService : ServiceBase, ITransient /// index,size /// [HttpGet] - public override async Task> GetPageList(string queryJson, string pagination) + public override async Task> GetPageList(string pagination, string queryJson="") { JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject(); diff --git a/Cis.Core/Cis.Core.xml b/Cis.Core/Cis.Core.xml index 6652a34..0ced89e 100644 --- a/Cis.Core/Cis.Core.xml +++ b/Cis.Core/Cis.Core.xml @@ -261,7 +261,7 @@ - equal:isDelete; between:[startTime,endTime]; + equal:id,isDelete; between:[startTime,endTime]; diff --git a/Cis.Core/Common/Entity/ServiceBase.cs b/Cis.Core/Common/Entity/ServiceBase.cs index d48d2c8..f960f3b 100644 --- a/Cis.Core/Common/Entity/ServiceBase.cs +++ b/Cis.Core/Common/Entity/ServiceBase.cs @@ -120,7 +120,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() /// /// /// - /// equal:isDelete; between:[startTime,endTime]; + /// equal:id,isDelete; between:[startTime,endTime]; /// [HttpGet] public virtual async Task GetQ(string queryJson) @@ -128,6 +128,8 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() JObject queryObj = queryJson.ToJObject(); var exp = Expressionable.Create(); + if (queryObj.TryGetValue("Id", StringComparison.OrdinalIgnoreCase, out JToken Id)) + exp.And(it => it.Id.Equals(Id)); 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) @@ -170,7 +172,7 @@ public class ServiceBase : IDynamicApiController where T : EntityBase, new() /// index,size /// [HttpGet] - public virtual async Task> GetPageList(string queryJson, string pagination) + public virtual async Task> GetPageList(string pagination, string queryJson = "") { JObject queryObj = queryJson.ToJObject(); Pagination pageObj = pagination.ToObject();