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

fix: QueryWrapper连表，表异名错误问题

Browse Source
This commit is contained in:
dhb52 2024-05-21 18:14:41 +08:00
parent 5c8d95e180
commit cb5fda35f7
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
snail-job-datasource/snail-job-datasource-template/src/main/resources/template/mapper/WorkflowTaskBatchMapper.xml
View File

@ -11,6 +11,7 @@
JOIN sj_workflow flow ON batch.workflow_id = flow.id JOIN sj_workflow flow ON batch.workflow_id = flow.id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<select id="selectWorkflowBatchList" <select id="selectWorkflowBatchList"
resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO"> resultType="com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO">
SELECT batch.*, SELECT batch.*,

3
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/JobTaskFailAlarmListener.java
View File

@ -70,7 +70,8 @@ public class JobTaskFailAlarmListener extends AbstractJobAlarm<JobTaskFailAlarmE
List<Long> jobTaskBatchIds = Lists.newArrayList(jobTaskBatchId); List<Long> jobTaskBatchIds = Lists.newArrayList(jobTaskBatchId);
queue.drainTo(jobTaskBatchIds, 200); queue.drainTo(jobTaskBatchIds, 200);
QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>() QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>()
.in("a.id", jobTaskBatchIds).eq("a.deleted", 0); .in("batch.id", jobTaskBatchIds)
.eq("batch.deleted", 0);
List<JobBatchResponseDO> jobTaskBatchList = jobTaskBatchMapper.selectJobBatchListByIds(wrapper); List<JobBatchResponseDO> jobTaskBatchList = jobTaskBatchMapper.selectJobBatchListByIds(wrapper);
return AlarmInfoConverter.INSTANCE.toJobAlarmInfos(jobTaskBatchList); return AlarmInfoConverter.INSTANCE.toJobAlarmInfos(jobTaskBatchList);
} }

8
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/alarm/listener/WorkflowTaskFailAlarmListener.java
View File

@ -14,7 +14,6 @@ import com.aizuda.snailjob.server.common.util.DateUtils;
import com.aizuda.snailjob.server.job.task.support.alarm.event.WorkflowTaskFailAlarmEvent; import com.aizuda.snailjob.server.job.task.support.alarm.event.WorkflowTaskFailAlarmEvent;
import com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO; import com.aizuda.snailjob.template.datasource.persistence.dataobject.WorkflowBatchResponseDO;
import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowTaskBatchMapper; import com.aizuda.snailjob.template.datasource.persistence.mapper.WorkflowTaskBatchMapper;
import com.aizuda.snailjob.template.datasource.persistence.po.JobTaskBatch;
import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowTaskBatch; import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowTaskBatch;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -63,9 +62,10 @@ public class WorkflowTaskFailAlarmListener extends AbstractWorkflowAlarm<Workflo
List<Long> workflowTaskBatchIds = Lists.newArrayList(workflowTaskBatchId); List<Long> workflowTaskBatchIds = Lists.newArrayList(workflowTaskBatchId);
queue.drainTo(workflowTaskBatchIds, 200); queue.drainTo(workflowTaskBatchIds, 200);
QueryWrapper<WorkflowTaskBatch> wrapper = new QueryWrapper<WorkflowTaskBatch>() List<WorkflowBatchResponseDO> workflowTaskBatches = workflowTaskBatchMapper.selectWorkflowBatchList(
.in("a.id", workflowTaskBatchIds).eq("a.deleted", 0); new QueryWrapper<WorkflowTaskBatch>()
List<WorkflowBatchResponseDO> workflowTaskBatches = workflowTaskBatchMapper.selectWorkflowBatchList(wrapper); .in("batch.id", workflowTaskBatchIds)
.eq("batch.deleted", 0));
return AlarmInfoConverter.INSTANCE.toWorkflowAlarmInfos(workflowTaskBatches); return AlarmInfoConverter.INSTANCE.toWorkflowAlarmInfos(workflowTaskBatches);
} }

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

@ -59,14 +59,14 @@ public class JobBatchServiceImpl implements JobBatchService {
} }
QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>() QueryWrapper<JobTaskBatch> wrapper = new QueryWrapper<JobTaskBatch>()
.eq("a.namespace_id", userSessionVO.getNamespaceId()) .eq("batch.namespace_id", userSessionVO.getNamespaceId())
.eq("a.system_task_type", SyetemTaskTypeEnum.JOB.getType()) .eq("batch.system_task_type", SyetemTaskTypeEnum.JOB.getType())
.eq(queryVO.getJobId() != null, "a.job_id", queryVO.getJobId()) .eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId())
.in(CollUtil.isNotEmpty(groupNames), "a.group_name", groupNames) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
.eq(queryVO.getTaskBatchStatus() != null, "task_batch_status", queryVO.getTaskBatchStatus()) .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus())
.likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job_name", queryVO.getJobName()) .likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job.job_name", queryVO.getJobName())
.eq("a.deleted", 0) .eq("batch.deleted", 0)
.orderByDesc("a.id"); .orderByDesc("batch.id");
List<JobBatchResponseDO> batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper); List<JobBatchResponseDO> batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper);
List<JobBatchResponseVO> batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.convertList( List<JobBatchResponseVO> batchResponseVOList = JobBatchResponseVOConverter.INSTANCE.convertList(
batchResponseDOList); batchResponseDOList);

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

@ -73,13 +73,13 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
} }
QueryWrapper<WorkflowTaskBatch> wrapper = new QueryWrapper<WorkflowTaskBatch>() QueryWrapper<WorkflowTaskBatch> wrapper = new QueryWrapper<WorkflowTaskBatch>()
.eq("a.namespace_id", userSessionVO.getNamespaceId()) .eq("batch.namespace_id", userSessionVO.getNamespaceId())
.eq(queryVO.getWorkflowId() != null, "a.workflow_id", queryVO.getWorkflowId()) .eq(queryVO.getWorkflowId() != null, "batch.workflow_id", queryVO.getWorkflowId())
.in(CollUtil.isNotEmpty(groupNames), "a.group_name", groupNames) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames)
.eq(queryVO.getTaskBatchStatus() != null, "task_batch_status", queryVO.getTaskBatchStatus()) .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus())
.likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "b.workflow_name", queryVO.getWorkflowName()) .likeRight(StrUtil.isNotBlank(queryVO.getWorkflowName()), "flow.workflow_name", queryVO.getWorkflowName())
.eq("a.deleted", 0) .eq("batch.deleted", 0)
.orderByDesc("a.id"); .orderByDesc("batch.id");
List<WorkflowBatchResponseDO> batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper); List<WorkflowBatchResponseDO> batchResponseDOList = workflowTaskBatchMapper.selectWorkflowBatchPageList(pageDTO, wrapper);
List<WorkflowBatchResponseVO> batchResponseVOList = List<WorkflowBatchResponseVO> batchResponseVOList =