|
@@ -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) {
|