日志分表 任务日志 操作日志 接口日志
添加对应的日志文件 修改主子表的表结构信息 删除无关字段信息 测试添加数据到历史表中
This commit is contained in:
parent
4f2ba2a3ee
commit
502342b15f
@ -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
|
||||
/// <summary>
|
||||
=======
|
||||
/// <summary>
|
||||
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
|
||||
/// Class to define batch edit fields
|
||||
/// </summary>
|
||||
public class InterfaceLog_BatchEdit : BaseVM
|
||||
|
||||
@ -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 (日志分表 任务日志 操作日志 接口日志)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -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<InterfaceLog_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<InterfaceLog>()
|
||||
<<<<<<< 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 (日志分表 任务日志 操作日志 接口日志)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
/// <summary>
|
||||
=======
|
||||
/// <summary>
|
||||
>>>>>>> 9d0241a (日志分表 任务日志 操作日志 接口日志)
|
||||
/// Class to define batch edit fields
|
||||
/// </summary>
|
||||
public class JobLog_BatchEdit : BaseVM
|
||||
|
||||
@ -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 (日志分表 任务日志 操作日志 接口日志)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -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<JobLog_View> GetSearchQuery()
|
||||
{
|
||||
var query = DC.Set<JobLog>()
|
||||
<<<<<<< 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 (日志分表 任务日志 操作日志 接口日志)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user