GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: JobServiceImpl wrapper简化

Browse Source
This commit is contained in:
dhb52 2024-05-06 00:40:10 +08:00
parent ed4ec0b340
commit aa486ad9c4
1 changed files with 42 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
View File

@ -30,12 +30,6 @@ import com.aizuda.snailjob.template.datasource.access.AccessTemplate;
import com.aizuda.snailjob.template.datasource.persistence.mapper.JobMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.GroupConfig;
import com.aizuda.snailjob.template.datasource.persistence.po.Job;
import com.aizuda.snailjob.server.job.task.dto.JobTaskPrepareDTO;
import com.aizuda.snailjob.server.job.task.support.JobPrePareHandler;
import com.aizuda.snailjob.server.job.task.support.JobTaskConverter;
import com.aizuda.snailjob.server.job.task.support.cache.ResidentTaskCache;
import com.aizuda.snailjob.server.web.service.convert.JobConverter;
import com.aizuda.snailjob.server.web.service.convert.JobResponseVOConverter;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import lombok.RequiredArgsConstructor;
@ -63,34 +57,33 @@ public class JobServiceImpl implements JobService {
private final JobPrePareHandler terminalJobPrepareHandler;
private final AccessTemplate accessTemplate;
private static Long calculateNextTriggerAt(final JobRequestVO jobRequestVO, Long time) {
if (Objects.equals(jobRequestVO.getTriggerType(), SystemConstants.WORKFLOW_TRIGGER_TYPE)) {
return 0L;
}
WaitStrategy waitStrategy = WaitStrategies.WaitStrategyEnum.getWaitStrategy(jobRequestVO.getTriggerType());
WaitStrategies.WaitStrategyContext waitStrategyContext = new WaitStrategies.WaitStrategyContext();
waitStrategyContext.setTriggerInterval(jobRequestVO.getTriggerInterval());
waitStrategyContext.setNextTriggerAt(time);
return waitStrategy.computeTriggerTime(waitStrategyContext);
}
@Override
public PageResult<List<JobResponseVO>> getJobPage(JobQueryVO queryVO) {
PageDTO<Job> pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize());
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
LambdaQueryWrapper<Job> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus());
queryWrapper.eq(Job::getNamespaceId, userSessionVO.getNamespaceId());
if (userSessionVO.isUser()) {
queryWrapper.in(Job::getGroupName, userSessionVO.getGroupNames());
}
if (StrUtil.isNotBlank(queryVO.getGroupName())) {
queryWrapper.eq(Job::getGroupName, queryVO.getGroupName());
}
if (StrUtil.isNotBlank(queryVO.getJobName())) {
queryWrapper.like(Job::getJobName, queryVO.getJobName().trim() + "%");
}
if (Objects.nonNull(queryVO.getJobStatus())) {
queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus());
}
queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus());
queryWrapper.orderByDesc(Job::getId);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
LambdaQueryWrapper<Job> wrapper = new LambdaQueryWrapper<Job>()
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
.in(userSessionVO.isUser(), Job::getGroupName, userSessionVO.getGroupNames())
.eq(StrUtil.isNotBlank(queryVO.getGroupName()), Job::getGroupName, queryVO.getGroupName())
.likeRight(StrUtil.isNotBlank(queryVO.getJobName()), Job::getJobName, queryVO.getJobName().trim())
.eq(Objects.nonNull(queryVO.getJobStatus()), Job::getJobStatus, queryVO.getJobStatus())
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.orderByDesc(Job::getId);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, wrapper);
List<JobResponseVO> jobResponseList = JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());
@ -99,7 +92,6 @@ public class JobServiceImpl implements JobService {
@Override
public JobResponseVO getJobDetail(Long id) {
Job job = jobMapper.selectById(id);
return JobResponseVOConverter.INSTANCE.toJobResponseVO(job);
}
@ -114,21 +106,12 @@ public class JobServiceImpl implements JobService {
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
LambdaQueryWrapper<Job> queryWrapper = new LambdaQueryWrapper<Job>()
.select(Job::getId, Job::getJobName);
queryWrapper.eq(Job::getNamespaceId, userSessionVO.getNamespaceId());
if (StrUtil.isNotBlank(keywords)) {
queryWrapper.like(Job::getJobName, keywords.trim() + "%");
}
if (StrUtil.isNotBlank(groupName)) {
queryWrapper.eq(Job::getGroupName, groupName);
}
if (Objects.nonNull(jobId)) {
queryWrapper.eq(Job::getId, jobId);
}
queryWrapper.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.select(Job::getId, Job::getJobName)
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
.likeRight(StrUtil.isNotBlank(keywords.trim()), Job::getJobName, keywords.trim())
.eq(StrUtil.isNotBlank(groupName), Job::getGroupName, groupName)
.eq(Objects.nonNull(jobId), Job::getId, jobId)
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.orderByAsc(Job::getId); // SQLServer 分页必须 ORDER BY
PageDTO<Job> pageDTO = new PageDTO<>(1, 20);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
@ -180,18 +163,6 @@ public class JobServiceImpl implements JobService {
return 1 == jobMapper.updateById(updateJob);
}
private static Long calculateNextTriggerAt(final JobRequestVO jobRequestVO, Long time) {
if (Objects.equals(jobRequestVO.getTriggerType(), SystemConstants.WORKFLOW_TRIGGER_TYPE)) {
return 0L;
}
WaitStrategy waitStrategy = WaitStrategies.WaitStrategyEnum.getWaitStrategy(jobRequestVO.getTriggerType());
WaitStrategies.WaitStrategyContext waitStrategyContext = new WaitStrategies.WaitStrategyContext();
waitStrategyContext.setTriggerInterval(jobRequestVO.getTriggerInterval());
waitStrategyContext.setNextTriggerAt(time);
return waitStrategy.computeTriggerTime(waitStrategyContext);
}
@Override
public Job updateJobResident(JobRequestVO jobRequestVO) {
Job job = JobConverter.INSTANCE.toJob(jobRequestVO);