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

fix: 获取job列表接口改为三个月以内的数据

Browse Source 
Signed-off-by: skyyemperor <skyyemperor@qq.com>
This commit is contained in:
skyyemperor
2022-09-29 22:10:04 +08:00
parent 7a5e6586a8
commit 9ba49670f9
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.File; import java.io.File;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -90,7 +91,7 @@ public class JobService {
public Result submit(String dataStr, BufferedInputStream dataStream, JSONObject param, String mail, Integer type) { public Result submit(String dataStr, BufferedInputStream dataStream, JSONObject param, String mail, Integer type) {
Job job = new Job("", JSON.toJSONString(param), mail, JobStatusEnum.WAIT.getKey(), LocalDateTime.now(), type); Job job = new Job("", JSON.toJSONString(param), mail, JobStatusEnum.WAIT.getKey(), LocalDateTime.now(), type);
jobMapper.insert(job); jobMapper.insert(job);
sendEmail(job.getJobId(), JobStatusEnum.WAIT, mail); sendEmail(job, JobStatusEnum.WAIT, mail);
try { try {
//将请求数据写入本地文件，之后向python传递文件路径参数 //将请求数据写入本地文件，之后向python传递文件路径参数
@@ -160,7 +161,7 @@ public class JobService {
job.setStatus(status.getKey()); job.setStatus(status.getKey());
jobMapper.updateById(job); jobMapper.updateById(job);
sendEmail(jobId, status, job.getMail()); sendEmail(job, status, job.getMail());
runNextJob(); runNextJob();
return getJobInfo(jobId); return getJobInfo(jobId);
@@ -226,27 +227,35 @@ public class JobService {
}, 4, TimeUnit.HOURS); }, 4, TimeUnit.HOURS);
} }
private void sendEmail(Integer jobId, JobStatusEnum status, String mail) { private void sendEmail(Job job, JobStatusEnum status, String mail) {
// 多个参数
String param1 = job.getRequestTime().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_")) + job.getJobId();
String param2 = job.getJobId().toString();
String content = null; String content = null;
switch (status) { switch (status) {
case WAIT: case WAIT:
content = String.format(RECEIVED_EMAIL_CONTENT, jobId); content = RECEIVED_EMAIL_CONTENT;
break; break;
case SUCCESS: case SUCCESS:
content = String.format(SUCCESS_EMAIL_CONTENT, jobId); content = SUCCESS_EMAIL_CONTENT;
break; break;
case FAIL: case FAIL:
content = String.format(FAIL_EMAIL_CONTENT, jobId); content = FAIL_EMAIL_CONTENT;
break; break;
case TIMEOUT: case TIMEOUT:
content = String.format(TIMEOUT_EMAIL_CONTENT, jobId); content = TIMEOUT_EMAIL_CONTENT;
break; break;
case RUNNING: case RUNNING:
content = String.format(START_RUNNING_EMAIL_CONTENT, jobId); content = START_RUNNING_EMAIL_CONTENT;
break; break;
} }
if (content != null)
mailUtil.send(mail, SUBJECT, content);
if (content != null) {
mailUtil.send(mail, SUBJECT, String.format(content, param1, param2));
}
} }
} }