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

feat(dev_1.1.0):

Browse Source 
1、任务批次列表新增任务类型返回值
2、Reduce阶段新增参数结果集
This commit is contained in:
wodeyangzipingpingwuqi 2024-06-14 13:43:29 +08:00
parent 89d118e554
commit 2c6925c4c1
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MrTaskResult.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapArgs.java
View File

@ -9,11 +9,11 @@ import lombok.Data;
* @date : 2024-06-12 13:59 * @date : 2024-06-12 13:59
*/ */
@Data @Data
public class MrTaskResult { public class MapArgs {
private String taskId; private String mapName;
private boolean success; private Boolean success;
private String result; private String result;
} }

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/dto/MapReduceArgs.java
View File

@ -3,6 +3,8 @@ package com.aizuda.snailjob.client.job.core.dto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* @author: opensnail * @author: opensnail
* @date : 2024-06-13 * @date : 2024-06-13
@ -13,4 +15,6 @@ import lombok.EqualsAndHashCode;
public class MapReduceArgs extends JobArgs { public class MapReduceArgs extends JobArgs {
private String mapName; private String mapName;
private List<MapArgs> mapArgsList;
} }

3
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapExecutor.java
View File

@ -11,7 +11,6 @@ import com.aizuda.snailjob.client.model.request.MapTaskRequest;
import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.constant.SystemConstants;
import com.aizuda.snailjob.common.core.exception.SnailJobMapReduceException; import com.aizuda.snailjob.common.core.exception.SnailJobMapReduceException;
import com.aizuda.snailjob.common.core.model.JobContext; import com.aizuda.snailjob.common.core.model.JobContext;
import com.aizuda.snailjob.common.core.model.MapContext;
import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.model.NettyResult;
import com.aizuda.snailjob.common.core.model.Result; import com.aizuda.snailjob.common.core.model.Result;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -35,7 +34,7 @@ public abstract class AbstractMapExecutor extends AbstractJobExecutor implements
@Override @Override
protected ExecuteResult doJobExecute(final JobArgs jobArgs) { protected ExecuteResult doJobExecute(final JobArgs jobArgs) {
MapReduceArgs mapReduceArgs = (MapReduceArgs) jobArgs; MapReduceArgs mapReduceArgs = (MapReduceArgs) jobArgs;
return doJobExecute(mapReduceArgs); return this.doJobExecute(mapReduceArgs);
} }
public abstract ExecuteResult doJobExecute(MapReduceArgs mapReduceArgs); public abstract ExecuteResult doJobExecute(MapReduceArgs mapReduceArgs);

6
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractMapReduceExecutor.java
View File

@ -1,9 +1,11 @@
package com.aizuda.snailjob.client.job.core.executor; package com.aizuda.snailjob.client.job.core.executor;
import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.job.core.dto.MapArgs;
import com.aizuda.snailjob.client.model.ExecuteResult; import com.aizuda.snailjob.client.model.ExecuteResult;
import com.aizuda.snailjob.common.core.model.JobContext; import com.aizuda.snailjob.common.core.model.JobContext;
import java.util.List;
/** /**
* @author zhengweilin * @author zhengweilin
* @version 1.0.0 * @version 1.0.0
@ -11,5 +13,5 @@ import com.aizuda.snailjob.common.core.model.JobContext;
*/ */
public abstract class AbstractMapReduceExecutor extends AbstractMapExecutor { public abstract class AbstractMapReduceExecutor extends AbstractMapExecutor {
protected abstract ExecuteResult doReduceExecute(JobContext jobContext, JobArgs jobArgs); protected abstract ExecuteResult doReduceExecute(JobContext jobContext, List<MapArgs> mapArgsList);
} }

5
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/JobBatchResponseVO.java
View File

@ -26,6 +26,11 @@ public class JobBatchResponseVO {
*/ */
private String jobName; private String jobName;
/**
* 任务类型
*/
private String taskType;
/** /**
* 工作流节点名称 * 工作流节点名称
*/ */