diff --git a/src/main/java/com/weilab/biology/controller/JobController.java b/src/main/java/com/weilab/biology/controller/JobController.java index e779e6f..7302622 100644 --- a/src/main/java/com/weilab/biology/controller/JobController.java +++ b/src/main/java/com/weilab/biology/controller/JobController.java @@ -121,4 +121,11 @@ public class JobController { public Result getJobList(@RequestParam(required = false) Integer type) { return jobService.getJobList(type); } + + @GetMapping("/list/v2") + public Result getJobList(@RequestParam(required = false) Integer type, + @RequestParam(defaultValue = "1") Integer page, + @RequestParam(defaultValue = "100") Integer size) { + return jobService.getJobList(type, page, size); + } } diff --git a/src/main/java/com/weilab/biology/mapper/JobMapper.java b/src/main/java/com/weilab/biology/mapper/JobMapper.java index 77000e8..08d9a94 100644 --- a/src/main/java/com/weilab/biology/mapper/JobMapper.java +++ b/src/main/java/com/weilab/biology/mapper/JobMapper.java @@ -1,11 +1,9 @@ package com.weilab.biology.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.weilab.biology.core.data.dto.JobLessDto; import com.weilab.biology.core.data.po.Job; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.python.modules.itertools.count; import java.util.List; @@ -22,4 +20,8 @@ public interface JobMapper extends BaseMapper { List selectJobList(@Param("type") Integer type); + List selectJobListByPage(@Param("type") Integer type, + @Param("offset") Integer offset, + @Param("count") Integer count); + } \ No newline at end of file diff --git a/src/main/java/com/weilab/biology/service/JobService.java b/src/main/java/com/weilab/biology/service/JobService.java index c768a11..b3095f7 100644 --- a/src/main/java/com/weilab/biology/service/JobService.java +++ b/src/main/java/com/weilab/biology/service/JobService.java @@ -172,6 +172,11 @@ public class JobService { return Result.success(jobs.stream().map(JobLessDto::parseJob).collect(Collectors.toList())); } + public Result getJobList(Integer type, Integer page, Integer size) { + List jobs = jobMapper.selectJobListByPage(type, (page - 1) * size, size); + return Result.success(jobs.stream().map(JobLessDto::parseJob).collect(Collectors.toList())); + } + /** * 运行下一个job */ @@ -232,7 +237,6 @@ public class JobService { String param1 = job.getJobId().toString(); String param2 = job.getRequestTime().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + job.getJobId(); - String content = null; switch (status) { case WAIT: diff --git a/src/main/resources/mapper/JobMapper.xml b/src/main/resources/mapper/JobMapper.xml index f30ba9b..c8e5020 100644 --- a/src/main/resources/mapper/JobMapper.xml +++ b/src/main/resources/mapper/JobMapper.xml @@ -43,8 +43,7 @@ + + \ No newline at end of file