定时任务新增加http请求

ZR.Admin.WebApi/Controllers/System/TasksController.cs

@@ -15,6 +15,7 @@ using ZR.Model.System;
 using ZR.Service.System.IService;
 using ZR.Tasks;
 using Snowflake.Core;
+using Infrastructure.Extensions;
 
 namespace ZR.Admin.WebApi.Controllers
 {
@@ -62,14 +63,14 @@ namespace ZR.Admin.WebApi.Controllers
         /// </summary>
         /// <param name="id">编码</param>
         /// <returns></returns>
-        [HttpGet("{id}")]
+        [HttpGet("get")]
         public IActionResult Get(string id)
         {
             if (!string.IsNullOrEmpty(id))
             {
                 return SUCCESS(_tasksQzService.GetId(id));
             }
-            return SUCCESS(_tasksQzService.GetAll());
+            return SUCCESS(null);
         }
 
         /// <summary>
@@ -90,7 +91,10 @@ namespace ZR.Admin.WebApi.Controllers
             {
                 throw new CustomException($"cron表达式不正确");
             }
-
+            if (string.IsNullOrEmpty(parm.ApiUrl) && parm.TaskType == 2)
+            {
+                throw new CustomException($"地址不能为空");
+            }
             //从 Dto 映射到 实体
             var tasksQz = parm.Adapt<SysTasksQz>().ToCreate();
             var worker = new IdWorker(1, 1);
@@ -98,7 +102,13 @@ namespace ZR.Admin.WebApi.Controllers
             tasksQz.ID = worker.NextId().ToString();
             tasksQz.IsStart = false;
             tasksQz.Create_by = HttpContext.GetName();
-
+            tasksQz.TaskType = parm.TaskType;
+            tasksQz.ApiUrl = parm.ApiUrl;
+            if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
+            {
+                tasksQz.AssemblyName = "ZR.Tasks";
+                tasksQz.ClassName = "TaskScheduler.HttpResultfulJob";
+            }
             return SUCCESS(_tasksQzService.Add(tasksQz));
         }
 
@@ -125,7 +135,15 @@ namespace ZR.Admin.WebApi.Controllers
                 throw new CustomException($"cron表达式不正确");
             }
             var tasksQz = _tasksQzService.GetFirst(m => m.ID == parm.ID);
-
+            if (string.IsNullOrEmpty(parm.ApiUrl) && parm.TaskType == 2)
+            {
+                throw new CustomException($"api地址不能为空");
+            }
+            if (parm.ApiUrl.IfNotEmpty() && parm.TaskType == 2)
+            {
+                parm.AssemblyName = "ZR.Tasks";
+                parm.ClassName = "TaskScheduler.HttpResultfulJob";
+            }
             if (tasksQz.IsStart)
             {
                 throw new CustomException($"该任务正在运行中，请先停止在更新");
@@ -142,10 +160,12 @@ namespace ZR.Admin.WebApi.Controllers
                 TriggerType = parm.TriggerType,
                 IntervalSecond = parm.IntervalSecond,
                 JobParams = parm.JobParams,
-                Update_by = User.Identity.Name,
+                Update_by = HttpContextExtension.GetName(HttpContext),
                 Update_time = DateTime.Now,
                 BeginTime = parm.BeginTime,
-                EndTime = parm.EndTime
+                EndTime = parm.EndTime,
+                TaskType = parm.TaskType,
+                ApiUrl = parm.ApiUrl,
             });
             if (response > 0)
             {

ZR.Model/System/Dto/TasksDto.cs

@@ -112,6 +112,11 @@ namespace ZR.Model.System.Dto
         /// </summary>
         [Display(Name = "传入参数")]
         public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
     }
 
     /// <summary>
@@ -219,6 +224,10 @@ namespace ZR.Model.System.Dto
         /// </summary>
         [Display(Name = "传入参数")]
         public string JobParams { get; set; }
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 1、程序集任务 2、apiUrl任务
+        /// </summary>
+        public int TaskType { get; set; }
     }
-
 }

ZR.Model/System/SysTasksQz.cs

@@ -157,5 +157,13 @@ namespace ZR.Model.System
         /// 最后运行时间
         /// </summary>
         public DateTime? LastRunTime { get; set; }
+        /// <summary>
+        /// api执行地址
+        /// </summary>
+        public string ApiUrl { get; set; }
+        /// <summary>
+        /// 任务类型 1程序集2网络请求
+        /// </summary>
+        public int TaskType { get; set; }
     }
 }

ZR.Tasks/JobFactory.cs

@@ -7,7 +7,7 @@ namespace ZR.Tasks
 {
     public class JobFactory : IJobFactory
     {
-        private NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+        private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
         /// <summary>
         /// 注入反射获取依赖对象
@@ -42,12 +42,10 @@ namespace ZR.Tasks
 
         public void ReturnJob(IJob job)
         {
-            var disposable = job as IDisposable;
+            if (job is IDisposable disposable)
-            if (disposable != null)
             {
                 disposable.Dispose();
             }
-
         }
     }
 }

ZR.Tasks/TaskScheduler/Job_HttpRequest.cs

@@ -0,0 +1,33 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Quartz;
+using Quartz.Impl;
+using Quartz.Impl.Triggers;
+using System.Threading.Tasks;
+using ZR.Service.System.IService;
+
+namespace ZR.Tasks.TaskScheduler
+{
+    [AppService(ServiceType = typeof(Job_HttpRequest), ServiceLifetime = LifeTime.Scoped)]
+    internal class Job_HttpRequest : JobBase, IJob
+    {
+        private readonly ISysTasksQzService tasksQzService;
+
+        public Job_HttpRequest(ISysTasksQzService tasksQzService)
+        {
+            this.tasksQzService = tasksQzService;
+        }
+        public async Task Execute(IJobExecutionContext context)
+        {
+            await ExecuteJob(context, async () => await Run(context));
+        }
+        public async Task Run(IJobExecutionContext context)
+        {
+            AbstractTrigger trigger = (context as JobExecutionContextImpl).Trigger as AbstractTrigger;
+            var info = await tasksQzService.GetByIdAsync(trigger.Name);
+
+            var result = await HttpHelper.HttpPostAsync("http://" + info.ApiUrl, info.JobParams);
+            //Console.WriteLine(result);
+        }
+    }
+}

ZR.Vue/src/views/monitor/job/index.vue

@@ -77,46 +77,71 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="24" v-if="this.form.id">
+          <el-col :lg="24" v-if="this.form.id">
             <el-form-item label="任务ID">
               <div>{{form.id}}</div>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :lg="12">
             <el-form-item label="任务名称" maxlength="200" prop="name">
               <el-input v-model="form.name" placeholder="请输入任务名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :lg="12">
             <el-form-item label="触发器类型" prop="triggerType">
               <el-select v-model="form.triggerType" placeholder="请选择触发器类型" style="width:100%">
                 <el-option v-for="item in triggerTypeOptions" :key="item.value" :label="item.label" :value="parseInt(item.value)" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :lg="12">
             <el-form-item label="任务分组" maxlength="200" prop="jobGroup">
               <el-select v-model="form.jobGroup" placeholder="请选择">
                 <el-option v-for="dict in jobGroupOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :lg="24">
-            <el-form-item label="程序集名称" maxlength="200" prop="assemblyName">
+            <el-form-item label="任务类型" prop="taskType">
-              <el-input v-model="form.assemblyName" placeholder="请输入程序集名称" />
+              <el-radio-group v-model="form.taskType">
+                <el-radio :label="1">执行程序集</el-radio>
+                <el-radio :label="2">执行url</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+
-            <el-form-item label="任务类名" maxlength="200" prop="className">
+          <el-col :lg="24" v-if="form.taskType == 2">
-              <el-input v-model="form.className" placeholder="请输入任务类名" />
+            <el-form-item label="apiUrl" prop="apiUrl">
+              <el-input v-model="form.apiUrl" placeholder="远程调用接口url">
+                <template slot="prepend">Http://</template>
+              </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <template v-else>
+            <el-col :lg="24">
+              <el-form-item label="程序集名称" maxlength="200" prop="assemblyName">
+                <el-input v-model="form.assemblyName" placeholder="请输入程序集名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :lg="24">
+              <el-form-item label="任务类名" maxlength="200" prop="className">
+                <el-input v-model="form.className" placeholder="请输入任务类名" />
+              </el-form-item>
+            </el-col>
+          </template>
+
+          <el-col :lg="24">
             <el-form-item label="传入参数" prop="jobParams">
+              <span slot="label">
+                <el-tooltip content="eg：{ token: abc123}" placement="top">
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+                传入参数
+              </span>
               <el-input v-model="form.jobParams" placeholder="传入参数" />
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-show="form.triggerType == 1">
+          <el-col :lg="24" v-show="form.triggerType == 1">
             <el-form-item label="间隔(Cron)" prop="cron">
               <!-- <el-input placeholder="如10分钟执行一次：0/0 0/10 * * * ?" v-model="form.cron">
                 <el-link slot="append" href="https://qqe2.com/cron" type="primary" target="_blank" class="mr10">cron在线生成</el-link>
@@ -131,22 +156,28 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :lg="12">
             <el-form-item label="开始日期" prop="beginTime">
+              <span slot="label">
+                <el-tooltip content="如果不写开始时间和结束时间，任务将以当前时间开始执行，到9999年结束" placement="top">
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+                开始日期
+              </span>
               <el-date-picker v-model="form.beginTime" style="width:100%" type="date" :picker-options="pickerOptions" placeholder="选择开始日期" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :lg="12">
             <el-form-item label="结束日期" prop="endTime">
               <el-date-picker v-model="form.endTime" style="width:100%" type="date" placeholder="选择结束日期" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :lg="24">
             <el-form-item v-show="form.triggerType == 0" label="执行间隔(秒)" prop="intervalSecond">
               <el-input-number v-model="form.intervalSecond" :max="9999999999" step-strictly controls-position="right" :min="1" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :lg="24">
             <el-form-item label="备注" prop="remark">
               <el-input type="textarea" v-model="form.remark" />
             </el-form-item>
@@ -178,6 +209,7 @@
 <script>
 import {
   queryTasks,
+  getTasks,
   createTasks,
   updateTasks,
   deleteTasks,
@@ -311,6 +343,9 @@ export default {
         triggerType: [
           { required: true, message: '请选择触发器类型', trigger: 'blur' }
         ],
+        apiUrl: [
+          { required: true, message: '请输入apiUrl地址', trigger: 'blur' }
+        ],
         cron: [{ validator: cronValidate, trigger: 'blur' }],
         beginTime: [{ validator: beginTimeValidate, trigger: 'blur' }],
         endTime: [{ validator: endTimeValidate, trigger: 'blur' }],
@@ -376,9 +411,11 @@ export default {
     handleUpdate(row) {
       this.reset()
 
-      this.form = row
+      getTasks(row.id).then((res) => {
-      this.open = true
+        this.form = res.data
-      this.title = '修改计划任务'
+        this.open = true
+        this.title = '修改计划任务'
+      })
     },
     /** 任务日志列表查询 */
     handleJobLog(id, title) {
@@ -400,17 +437,14 @@ export default {
     },
     /** 确定后回传值 */
     crontabFill(value) {
-			console.log(value)
+      console.log(value)
       this.form.cron = value
     },
     // 启动按钮
     handleStart(row) {
       startTasks(row.id).then((response) => {
         if (response.code === 200) {
-          this.$message({
+          this.msgSuccess(response.msg)
-            message: response.msg,
-            type: 'success'
-          })
           this.open = false
           this.getList()
         }
@@ -420,10 +454,7 @@ export default {
     handleStop(row) {
       stopTasks(row.id).then((response) => {
         if (response.code === 200) {
-          this.$message({
+          this.msgSuccess(response.msg)
-            message: response.msg,
-            type: 'success'
-          })
           this.open = false
           this.getList()
         }
@@ -446,10 +477,7 @@ export default {
           deleteTasks(jobInfo.id).then((response) => {
             if (response.code === 200) {
               this.getList()
-              this.$message({
+              this.msgSuccess('删除成功')
-                message: '删除成功',
-                type: 'success'
-              })
             }
           })
         })
@@ -466,10 +494,7 @@ export default {
       }).then((res) => {
         runTasks(jobInfo.id).then((res) => {
           if (res.code === 200) {
-            this.$message({
+            this.msgSuccess('执行成功')
-              message: '执行成功',
-              type: 'success'
-            })
             this.getList()
           }
         })
@@ -482,10 +507,7 @@ export default {
           if (this.form.id !== undefined) {
             updateTasks(this.form).then((response) => {
               if (response.code === 200) {
-                this.$message({
+                this.msgSuccess('修改成功')
-                  message: '修改成功',
-                  type: 'success'
-                })
                 this.open = false
                 this.getList()
               }
@@ -493,10 +515,7 @@ export default {
           } else {
             createTasks(this.form).then((response) => {
               if (response.code === 200) {
-                this.$message({
+                this.msgSuccess('新增成功')
-                  message: '新增成功',
-                  type: 'success'
-                })
                 this.open = false
                 this.getList()
               }
@@ -524,7 +543,8 @@ export default {
         beginTime: undefined,
         endTime: undefined,
         intervalSecond: 1,
-        cron: undefined
+        cron: undefined,
+        taskType: 1
       }
       this.resetForm('form')
     },

document/admin-mysql.sql

@@ -26,6 +26,8 @@ CREATE TABLE `Sys_TasksQz`  (
   `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人编码',
   `update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人编码',
   `lastRunTime` datetime(0) NULL DEFAULT NULL COMMENT '最后执行时间',
+  `apiUrl` varchar(200) NULL DEFAULT NULL COMMENT '网络请求地址',
+  `taskType` int(11) NULL DEFAULT NULL COMMENT '任务类型1程序集 2网络请求'
   PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '计划任务' ROW_FORMAT = Dynamic;
 

document/admin-sqlserver.sql

@@ -25,6 +25,8 @@ CREATE TABLE sys_tasksQz
 	create_by varchar(50)  NULL DEFAULT NULL , --'创建人编码',
 	update_by varchar(50)  NULL DEFAULT NULL , --'更新人编码',
 	lastRunTime datetime					,  --最后执行时间
+	taskType int null						,  --任务类型 1程序集 2网络请求
+	apiUrl	varchar(200)					--网络请求地址
 )
 GO
 INSERT INTO sys_tasksQz VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL);