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

任务新增执行SQL脚本

Browse Source
This commit is contained in:
不做码农
2022-12-01 17:01:41 +08:00
parent 38d0de26e9
commit c3b7aa9b00
7 changed files with 86 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "monitor:job:list")]
public IActionResult Query([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
public IActionResult ListTask([FromQuery] TasksQueryDto parm, [FromQuery] PagerInfo pager)
{
//开始拼装查询条件
var predicate = Expressionable.Create<SysTasks>();
@@ -51,6 +51,7 @@ namespace ZR.Admin.WebApi.Controllers
m => m.Name.Contains(parm.QueryText) ||
m.JobGroup.Contains(parm.QueryText) ||
m.AssemblyName.Contains(parm.QueryText));
predicate.AndIF(parm.TaskType != null, m => m.TaskType == parm.TaskType);
var response = _tasksQzService.GetPages(predicate.ToExpression(), pager, f => f.IsStart, OrderByType.Desc);
@@ -94,6 +95,15 @@ namespace ZR.Admin.WebApi.Controllers
{
throw new CustomException($"地址不能为空");
}
if (string.IsNullOrEmpty(parm.SqlText) && parm.TaskType == 3)
{
throw new CustomException($"sql语句不能为空");
}
if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3)
{
parm.AssemblyName = "ZR.Tasks";
parm.ClassName = "TaskScheduler.Job_SqlExecute";
}
if (parm.TaskType == 1 && (parm.AssemblyName.IsEmpty() || parm.ClassName.IsEmpty()))
{
throw new CustomException($"程序集或者类名不能为空");
@@ -113,7 +123,7 @@ namespace ZR.Admin.WebApi.Controllers
[HttpPost("update")]
[ActionPermissionFilter(Permission = "monitor:job:edit")]
[Log(Title = "修改任务", BusinessType = BusinessType.UPDATE)]
public async Task<IActionResult> Update([FromBody] TasksUpdateDto parm)
public async Task<IActionResult> Update([FromBody] TasksCreateDto parm)
{
//判断是否已经存在
if (_tasksQzService.Any(m => m.Name == parm.Name && m.ID != parm.ID))
@@ -138,6 +148,11 @@ namespace ZR.Admin.WebApi.Controllers
parm.AssemblyName = "ZR.Tasks";
parm.ClassName = "TaskScheduler.Job_HttpRequest";
}
if (parm.SqlText.IfNotEmpty() && parm.TaskType == 3)
{
parm.AssemblyName = "ZR.Tasks";
parm.ClassName = "TaskScheduler.Job_SqlExecute";
}
if (tasksQz.IsStart)
{
throw new CustomException($"该任务正在运行中，请先停止在更新");