skyyemperor/ai-backend-template
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: 增大超时时间

Browse Source 
Signed-off-by: skyyemperor <skyyemperor@qq.com>
This commit is contained in:
skyyemperor
2023-02-26 20:35:07 +08:00
parent 8de89de837
commit a5a71775dc
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/weilab/biology/controller/JobController.java
View File

@@ -164,7 +164,7 @@ public class JobController {
job.setParam(JSON.toJSONString(params));
jobMapper.updateById(job);
return Result.success(job);
return Result.success(JobDto.parseJob(job));
}
} catch (Exception e) {
e.printStackTrace();

19
src/main/java/com/weilab/biology/service/JobService.java
View File

@@ -127,8 +127,9 @@ public class JobService {
public Result updateJobStatus(Integer jobId, JobStatusEnum status, String result) {
System.out.println(status.getRemark());
Job job = jobMapper.selectById(jobId);
if (job == null)
if (job == null) {
return Result.getResult(CommonError.CONTENT_NOT_FOUND);
}
switch (status) {
case WAIT:
@@ -140,13 +141,15 @@ public class JobService {
case FAIL:
case TIMEOUT:
if (!job.getStatus().equals(JobStatusEnum.RUNNING.getKey())
&& !job.getStatus().equals(JobStatusEnum.REQED.getKey()))
&& !job.getStatus().equals(JobStatusEnum.REQED.getKey())){
return Result.getResult(JobError.STATUS_UPDATE_FAIL);
}
job.setCompleteTime(LocalDateTime.now());
break;
case RUNNING:
if (!job.getStatus().equals(JobStatusEnum.REQED.getKey()))
if (!job.getStatus().equals(JobStatusEnum.REQED.getKey())) {
return Result.getResult(JobError.STATUS_UPDATE_FAIL);
}
job.setCreateTime(LocalDateTime.now());
break;
}
@@ -205,24 +208,24 @@ public class JobService {
}
/**
* 等待运行，超时时间60秒
* 等待运行
*/
private void waitRunning(Integer jobId) {
//等待60秒，检查是否已运行
//等待120秒，检查是否已运行
taskExecutorUtil.schedule(() -> {
Job job = jobMapper.selectById(jobId);
if (job.getStatus().equals(JobStatusEnum.REQED.getKey())) {
updateJobStatus(jobId, JobStatusEnum.FAIL);
}
}, 60, TimeUnit.SECONDS);
}, 120, TimeUnit.SECONDS);
//等待4小时，查看是否执行完成
//等待14小时，查看是否执行完成
taskExecutorUtil.schedule(() -> {
Job job = jobMapper.selectById(jobId);
if (job.getStatus().equals(JobStatusEnum.RUNNING.getKey())) {
updateJobStatus(jobId, JobStatusEnum.TIMEOUT);
}
}, 4, TimeUnit.HOURS);
}, 14, TimeUnit.HOURS);
}
private void sendEmail(Job job, JobStatusEnum status, String mail) {