Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net5.0'

Browse Source
This commit is contained in:
不做码农
2022-05-10 13:54:16 +08:00
parent 151f685e2b 6c948c868b
commit 34be422eef
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@@ -95,6 +95,10 @@ namespace ZR.Admin.WebApi.Controllers
{
throw new CustomException($"地址不能为空");
}
if (parm.TaskType == 1 && (parm.AssemblyName.IsEmpty() || parm.ClassName.IsEmpty()))
{
throw new CustomException($"程序集或者类名不能为空");
}
//从 Dto 映射到 实体
var tasksQz = parm.Adapt<SysTasksQz>().ToCreate();
var worker = new IdWorker(1, 1);
@@ -107,7 +111,7 @@ namespace ZR.Admin.WebApi.Controllers
if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
{
tasksQz.AssemblyName = "ZR.Tasks";
tasksQz.ClassName = "TaskScheduler.HttpResultfulJob";
tasksQz.ClassName = "TaskScheduler.Job_HttpRequest";
}
return SUCCESS(_tasksQzService.Add(tasksQz));
}
@@ -142,7 +146,7 @@ namespace ZR.Admin.WebApi.Controllers
if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
{
parm.AssemblyName = "ZR.Tasks";
parm.ClassName = "TaskScheduler.HttpResultfulJob";
parm.ClassName = "TaskScheduler.Job_HttpRequest";
}
if (tasksQz.IsStart)
{

4
ZR.Admin.WebApi/Controllers/System/TasksLogController.cs
View File

@@ -34,8 +34,8 @@ namespace ZR.Admin.WebApi.Controllers.System
public IActionResult GetList([FromQuery] PagerInfo pager, [FromQuery] TasksLogQueryDto queryDto)
{
//开始拼装查询条件
queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -1);
queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 1);
queryDto.BeginTime = DateTimeHelper.GetBeginTime(queryDto.BeginTime, -7);
queryDto.EndTime = DateTimeHelper.GetBeginTime(queryDto.EndTime, 7);
var predicate = Expressionable.Create<SysTasksLog>().And(it => it.CreateTime >= queryDto.BeginTime && it.CreateTime <= queryDto.EndTime);
predicate = predicate.AndIF(queryDto.JobName.IfNotEmpty(), m => m.JobName.Contains(queryDto.JobName));