From 12e16e0c6c6e8e83f4a505b786e26aec7bef61e8 Mon Sep 17 00:00:00 2001 From: zhougf Date: Wed, 17 Apr 2024 12:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InterfaceLogVMs/InterfaceLogBatchVM.cs | 10 +------ .../InterfaceLogVMs/InterfaceLogImportVM.cs | 10 +------ .../InterfaceLogVMs/InterfaceLogListVM.cs | 27 ++----------------- .../InterfaceLogVMs/InterfaceLogSearcher.cs | 6 +---- .../InterfaceLogVMs/InterfaceLogVM.cs | 10 +------ .../ViewModels/JobLogVMs/JobLogBatchVM.cs | 10 +------ .../ViewModels/JobLogVMs/JobLogImportVM.cs | 11 +------- .../ViewModels/JobLogVMs/JobLogListVM.cs | 21 +-------------- .../ViewModels/JobLogVMs/JobLogSearcher.cs | 7 +---- .../_Admin/ViewModels/JobLogVMs/JobLogVM.cs | 10 +------ 10 files changed, 11 insertions(+), 111 deletions(-) diff --git a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs index 89715b6..a569dbc 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogBatchVM.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 @@ -23,11 +19,7 @@ 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 04c66bb..5cb773f 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogImportVM.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 @@ -16,11 +12,7 @@ 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 5283eec..683d9ed 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogListVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -6,11 +6,6 @@ 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 { @@ -54,7 +49,6 @@ 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) @@ -67,20 +61,6 @@ 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, @@ -100,12 +80,9 @@ 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 d95f65e..e684e97 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogSearcher.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 098698c..acc5b91 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/InterfaceLogVMs/InterfaceLogVM.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; 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 @@ -25,11 +21,7 @@ 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 1e654e3..7ef8639 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogBatchVM.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 @@ -23,11 +19,7 @@ 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 bb37a7e..a392195 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogImportVM.cs @@ -1,26 +1,17 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 { 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 1767c56..1c95699 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogListVM.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -6,10 +6,6 @@ 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 @@ -54,7 +50,6 @@ 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,16 +58,6 @@ 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, @@ -92,12 +77,8 @@ 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 866b996..fd12190 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogSearcher.cs @@ -1,15 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; 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 0d429b9..5ecbbc0 100644 --- a/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs +++ b/HHWMS.Web/Areas/_Admin/ViewModels/JobLogVMs/JobLogVM.cs @@ -1,14 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; 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 @@ -25,11 +21,7 @@ namespace HHWMS.Web } public override void DoAdd() -<<<<<<< HEAD - { -======= { ->>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志) base.DoAdd(); }