lwhhszx пре 2 година
родитељ
комит
65f2379d94

+ 8 - 1
src/main/java/com/example/demo/service/TaskAddJob.java

@@ -21,6 +21,13 @@ public class TaskAddJob extends QuartzJobBean {
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
         JobDataMap jobDataMap =   context.getTrigger().getJobDataMap();
         QrtzTask qrtzTask = (QrtzTask) jobDataMap.get("qrtzTask");
-        logger.info("添加任务"+"信息是"+qrtzTask);
+
+        QrtzTask task =new QrtzTask();
+        task.setTaskType(0);
+        task.setConditions(qrtzTask.getConditions());
+        task.setProjectId(qrtzTask.getProjectId());
+        task.setTaskState(0);
+        task.insert();
+        logger.info("添加任务"+"信息是"+task);
     }
 }

+ 3 - 1
src/main/java/com/example/demo/service/WebUploadJob.java

@@ -32,12 +32,14 @@ public class WebUploadJob extends QuartzJobBean {
 
             //查找是否有任务正在进行
             LambdaQueryWrapper<QrtzTask> queryWrapper =new LambdaQueryWrapper<>();
-            queryWrapper.eq(QrtzTask::getTaskState,1);
+            queryWrapper.eq(QrtzTask::getTaskState,1)
+            .eq(QrtzTask::getTaskType,0);
             List<QrtzTask> qrtzTaskList =  qrTaskService.list(queryWrapper);
             //当无任务在进行时
             if(qrtzTaskList.size()==0){
                 LambdaQueryWrapper<QrtzTask> getDoingWrapper = new LambdaQueryWrapper<>();
                 getDoingWrapper.eq(QrtzTask::getTaskState,0)
+                        .eq(QrtzTask::getTaskType,0)
                         .orderByAsc(QrtzTask::getCreateTime).last("limit 1");
                 QrtzTask qrtzTask = qrTaskService.getOne(getDoingWrapper);
                 if(qrtzTask!=null) {