From 502342b15f829e03052d1d87c4a7adecfce777f8 Mon Sep 17 00:00:00 2001 From: zhougf Date: Fri, 15 Mar 2024 18:45:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E8=A1=A8=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E6=8E=A5=E5=8F=A3=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94=E7=9A=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=A1=A8=E7=BB=93=E6=9E=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E6=97=A0=E5=85=B3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=B5=8B=E8=AF=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=E5=8E=86=E5=8F=B2=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InterfaceLogVMs/InterfaceLogBatchVM.cs | 7 ++++++ .../InterfaceLogVMs/InterfaceLogImportVM.cs | 7 ++++++ .../InterfaceLogVMs/InterfaceLogListVM.cs | 23 +++++++++++++++++++ .../InterfaceLogVMs/InterfaceLogSearcher.cs | 3 +++ .../InterfaceLogVMs/InterfaceLogVM.cs | 7 ++++++ .../ViewModels/JobLogVMs/JobLogBatchVM.cs | 7 ++++++ .../ViewModels/JobLogVMs/JobLogImportVM.cs | 7 ++++++ .../ViewModels/JobLogVMs/JobLogListVM.cs | 19 +++++++++++++++ .../ViewModels/JobLogVMs/JobLogSearcher.cs | 3 +++ .../_Admin/ViewModels/JobLogVMs/JobLogVM.cs | 7 ++++++ 10 files changed, 90 insertions(+) diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs index e17c78a..89715b6 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -20,7 +23,11 @@ namespace HHWMS.Web } +<<<<<<< HEAD /// +======= + /// +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) /// Class to define batch edit fields /// public class InterfaceLog_BatchEdit : BaseVM diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs index 3b615bc..04c66bb 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -13,7 +16,11 @@ namespace HHWMS.Web public partial class InterfaceLogTemplateVM : BaseTemplateVM { +<<<<<<< HEAD protected override void InitVM() +======= + protected override void InitVM() +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) { } diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs index 2662b55..5283eec 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs @@ -6,7 +6,10 @@ using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -51,6 +54,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() +<<<<<<< HEAD .CheckContain(Searcher.ModuleName, x=>x.ModuleName) .CheckContain(Searcher.ActionName, x=>x.ActionName) .CheckContain(Searcher.ITCode, x=>x.ITCode) @@ -63,6 +67,20 @@ namespace HHWMS.Web .Select(x => new InterfaceLog_View { ID = x.ID, +======= + .CheckContain(Searcher.ModuleName, x => x.ModuleName) + .CheckContain(Searcher.ActionName, x => x.ActionName) + .CheckContain(Searcher.ITCode, x => x.ITCode) + .CheckContain(Searcher.ActionUrl, x => x.ActionUrl) + .CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false) + .CheckContain(Searcher.IP, x => x.IP) + .CheckEqual(Searcher.LogType, x => x.LogType) + .CheckContain(Searcher.Request, x => x.Request) + .CheckContain(Searcher.Result, x => x.Result) + .Select(x => new InterfaceLog_View + { + ID = x.ID, +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) ModuleName = x.ModuleName, ActionName = x.ActionName, ITCode = x.ITCode, @@ -82,7 +100,12 @@ namespace HHWMS.Web } +<<<<<<< HEAD public class InterfaceLog_View : InterfaceLog{ +======= + public class InterfaceLog_View : InterfaceLog + { +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) } } diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs index 7c0cfa0..d95f65e 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs index efa7a1c..098698c 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs @@ -5,7 +5,10 @@ using System.Threading.Tasks; using System.ComponentModel.DataAnnotations; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -22,7 +25,11 @@ namespace HHWMS.Web } public override void DoAdd() +<<<<<<< HEAD { +======= + { +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) base.DoAdd(); } diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs index 5f92a14..1e654e3 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -20,7 +23,11 @@ namespace HHWMS.Web } +<<<<<<< HEAD /// +======= + /// +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) /// Class to define batch edit fields /// public class JobLog_BatchEdit : BaseVM diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs index 4a938ff..bb37a7e 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -13,7 +16,11 @@ namespace HHWMS.Web public partial class JobLogTemplateVM : BaseTemplateVM { +<<<<<<< HEAD protected override void InitVM() +======= + protected override void InitVM() +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) { } diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs index 84886c6..1767c56 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs @@ -6,7 +6,10 @@ using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -51,6 +54,7 @@ namespace HHWMS.Web public override IOrderedQueryable GetSearchQuery() { var query = DC.Set() +<<<<<<< HEAD .CheckContain(Searcher.ModuleName, x=>x.ModuleName) .CheckContain(Searcher.ActionName, x=>x.ActionName) .CheckContain(Searcher.ITCode, x=>x.ITCode) @@ -59,6 +63,16 @@ namespace HHWMS.Web .Select(x => new JobLog_View { ID = x.ID, +======= + .CheckContain(Searcher.ModuleName, x => x.ModuleName) + .CheckContain(Searcher.ActionName, x => x.ActionName) + .CheckContain(Searcher.ITCode, x => x.ITCode) + .CheckContain(Searcher.ActionUrl, x => x.ActionUrl) + .CheckBetween(Searcher.ActionTime?.GetStartTime(), Searcher.ActionTime?.GetEndTime(), x => x.ActionTime, includeMax: false) + .Select(x => new JobLog_View + { + ID = x.ID, +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) ModuleName = x.ModuleName, ActionName = x.ActionName, ITCode = x.ITCode, @@ -78,7 +92,12 @@ namespace HHWMS.Web } +<<<<<<< HEAD public class JobLog_View : JobLog{ +======= + public class JobLog_View : JobLog + { +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) } } diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs index b423961..866b996 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs @@ -5,7 +5,10 @@ using System.Linq; using System.Threading.Tasks; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs index b5115f8..0d429b9 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs @@ -5,7 +5,10 @@ using System.Threading.Tasks; using System.ComponentModel.DataAnnotations; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; +<<<<<<< HEAD using WalkingTec.Mvvm.Core; +======= +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) namespace HHWMS.Web @@ -22,7 +25,11 @@ namespace HHWMS.Web } public override void DoAdd() +<<<<<<< HEAD { +======= + { +>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) base.DoAdd(); }