From 996acccd51e8fd31a26d92b012e34b6fbbcf2237 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 22 八月 2024 14:40:59 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/JobController.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/JobController.cs b/Wms/Wms/Controllers/JobController.cs
index 2875076..f35990d 100644
--- a/Wms/Wms/Controllers/JobController.cs
+++ b/Wms/Wms/Controllers/JobController.cs
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Quartz;
+using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Utility.Entity;
@@ -37,14 +38,14 @@
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost]
- public async Task<string> AddJob([FromBody] ScheduleEntity entity)
+ public async Task<string> AddJob(ScheduleEntity entity)
{
if (entity.TriggerType == TriggerTypeEnum.Cron &&
entity.Cron == "* * * * * ?")
{
return "涓嶅厑璁歌繃棰戠箒鎵ц浠诲姟锛�";
}
-
+ throw Oops.Bah("娴嬭瘯寮傚父");
return await scheduler.AddScheduleJobAsync(entity);
}
@@ -94,10 +95,18 @@
/// <param name="entity"></param>
/// <returns></returns>
[HttpPost]
- public async Task<string> ModifyJob([FromBody] ModifyJobInput entity)
+ public async Task<string> ModifyJob(ModifyJobInput entity)
{
var jobKey = new JobKey(entity.OldScheduleEntity.JobName, entity.OldScheduleEntity.JobGroup);
- var runNumber = await scheduler.GetRunNumberAsync(jobKey);
+ long runNumber = 0;
+ try
+ {
+ runNumber = await scheduler.GetRunNumberAsync(jobKey);
+ }
+ catch (Exception)
+ {
+
+ }
await scheduler.StopOrDelScheduleJobAsync(entity.OldScheduleEntity.JobGroup, entity.OldScheduleEntity.JobName, true);
await scheduler.AddScheduleJobAsync(entity.NewScheduleEntity, runNumber);
return "淇敼璁″垝浠诲姟鎴愬姛锛�";
--
Gitblit v1.8.0