Skip to content

B
byit-myth-job
Commit b8254234 by guo_minglei@163.com
Options

添加解析和缺少实体类

parent 4ad9f574
Showing with 390 additions and 62 deletions
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/JobTaskRunLog.java 0 → 100644
package com.byit.dto.plugin;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* @author huangfu
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class JobTaskRunLog implements Serializable {
/**
* 日志ID
*/
private Integer logId;
/**
* 当前节点的失败剩余重试次数 初始阶段为初始的重试次数
*/
private Integer failedRemainingCount;
/**
* 版本名称
*/
private String versionName;
/**
* 任务流主键
*/
private Integer flowId;
/**
* 所属任务流的名称
*/
private String flowName;
/**
* 执行机主键
*/
private Integer jobGroupId;
/**
* 插件方节点key
*/
private String handlerName;
/**
* 节点名称
*/
private String nodeName;
/**
* 是否是虚节点（0 是， 1 否），虚节点代表是内嵌工作流
*/
private String isVirtual;
/**
* 运行结果 0运行中 1 成功 2 失败 3 补批成功 4 补批失败 5.kill 6.上级节点执行失败
*/
private String runCode;
/**
* 运行参数
*/
private String runParams;
/**
* 运行方式 1执行机运行，2插件运行
*/
private String runType;
/**
* 调度结果 1成功 2失败
*/
private String triggerCode;
/**
* 触发时间
*/
private Date triggerTime;
/**
* 执行机的IP地址
*/
private String jobGroupIp;
/**
* 映射的工作流id（当节点为虚节点，有意义）
*/
private Integer mapFlowId;
/**
* 运行命令
*/
private String runCommand;
/**
* 结束时间
*/
private Date endTime;
/**
* 开始时间
*/
private Date startTime;
/**
* 节点id
*/
private Integer nodeId;
/**
* 节点任务类型
*/
private String jobType;
/**
* 是否已完成告警(0未完成 1完成)
*/
private String alertEnd;
/**
* 运行标识
*/
private String runId;
/**
* 重跑的运行标识
*/
private String reRunId;
/**
* 日志文件的地址
*/
private String logFileName;
/**
* 是否上级运行成功时运行（0 是 1 否）
*/
private String superSuccessRun;
/**
* 执行次数
*/
private Integer runCount;
/**
* 日志文件的远程路径
*/
private String logRemotelyPath;
/**
* 依赖节点id集合
*/
private String nodeDepend;
/**
* 重跑和补批的操作人
*/
private String operator;
/**
* 跑批类型 1 正常跑批 2 重跑 3 补批
*/
private Integer scheduleType;
/**
*
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/RunRecording.java 0 → 100644
package com.byit.dto.plugin;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class RunRecording implements Serializable {
/**
* 记录主键
*/
private Integer recordingId;
/**
* 运行标识
*/
private String runId;
/**
* 当前工作流版本的报警邮箱
*/
private String alarmEmail;
/**
* 被哪一个调度器加载的
*/
private String dispatchIp;
/**
* 工作流的名字
*/
private String flowName;
/**
* 执行结果 1 成功 2 失败 3 补批成功 4 补批失败 5.kill
*/
private String flowRunResult;
/**
* 运行状态 1 未开始 2运行中 3暂停 4完成
*/
private String flowStatus;
/**
* 工作流的超时时间
*/
private Long flowTimeout;
/**
* 工作流的版本名称
*/
private String flowVersionName;
/**
* 当前工作流版本的告警的时机(0 不告警， 1 完成时告警， 2 失败时告警， 3 成功时告警)
*/
private String alarmlAction;
/**
* 设置任务的优先级，1最低 2最高
*/
private String priority;
/**
* 本次任务的执行时间
*/
private Long triggerTime;
/**
* 责任人
*/
private String principal;
/**
* 工作流Id
*/
private Integer flowId;
/**
* 开始时间
*/
private Date startTime;
/**
* 结束时间
*/
private Date endTime;
/**
* 是否已告警(0，是 1，否)
*/
private String isAlarm;
/**
* 是否是内嵌工作流 0 否， 1 是
*/
private String isInner;
/**
* 快速失败标识 0 不快速失败 1 快速失败
*/
private String failFast;
/**
* 工作流节点数量
*/
private Integer flowNodeCount;
/**
* 跑批类型 1 正常跑批 2 重跑 3 补批
*/
private Integer scheduleType;
/**
* 重跑和补批的操作人
*/
private String operator;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/RunRecordingVo.java 0 → 100644
package com.byit.dto.plugin;
import lombok.Data;
import java.util.List;
/**
* @description: 运行实例记录VO类
* @author: gml
* @create: 2020/2/28
*/
@Data
public class RunRecordingVo extends RunRecording {
private List<JobTaskRunLog> jobTaskRunLogList;
}
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java
package com.byit.utils;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.byit.dto.executor.PluginBeanJobInfo;
import com.byit.dto.plugin.PluginPackage;
import com.byit.dto.web.ResponseResult;
import com.byit.executor.handler.interfaces.IJobHandler;
import lombok.extern.slf4j.Slf4j;
......@@ -114,12 +114,12 @@ public class JobUtils {
* @param pluginBeanJobInfo 任务节点的详尽配置
* @return 添加结果
*/
public static String addJob(PluginBeanJobInfo pluginBeanJobInfo){
public static ResponseResult addJob(PluginBeanJobInfo pluginBeanJobInfo){
log.info("---------------开始添加一个任务,jobHandelName:{}---------------------", pluginBeanJobInfo.getJobHandelName());
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_ADD_JOB_RESOURCES_SUFFIX, JSON.toJSONString(pluginBeanJobInfo));
log.info("--------------------添加任务完成，添加结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_ADD_JOB_RESOURCES_SUFFIX, JSON.toJSONString(pluginBeanJobInfo));
log.info("--------------------添加任务完成，添加结果为：{}------------------------", response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -127,14 +127,14 @@ public class JobUtils {
* @param pluginPackage
* @return
*/
public static String publish(PluginPackage pluginPackage){
public static ResponseResult publish(PluginPackage pluginPackage){
log.info("---------------开始发布工作流,flowName:{}---------------------", pluginPackage.getFlow().getName());
//发送请求 添加任务
String publishRequestResult = createHttpRequest(REQUEST_FLOW_PUBLISH, "param=" + JSON.toJSONString(pluginPackage, WriteClassName));
String response = createHttpRequest(REQUEST_FLOW_PUBLISH, "param=" + JSON.toJSONString(pluginPackage, WriteClassName));
//String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginPackage, WriteClassName))
log.info("--------------------添加任务完成，添加结果为：{}------------------------", publishRequestResult);
return publishRequestResult;
log.info("--------------------添加任务完成，添加结果为：{}------------------------", response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -143,14 +143,14 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String startFlow(String flowName, String workspaceName){
public static ResponseResult startFlow(String flowName, String workspaceName){
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String startRequestResult = createHttpRequest(REQUEST_FLOW_START, "param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------开始接口调用成功，结果为：{}------------------------", startRequestResult);
return startRequestResult;
String response = createHttpRequest(REQUEST_FLOW_START, "param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------开始接口调用成功，结果为：{}------------------------", response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -159,15 +159,14 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String stopFlow(String flowName, String workspaceName){
public static ResponseResult stopFlow(String flowName, String workspaceName){
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_STOP,"param="+JSON.toJSONString(map,WriteClassName));
//String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginPackage, WriteClassName))
log.info("--------------------暂停接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_STOP,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------暂停接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -176,14 +175,14 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String deleteFlow(String flowName, String workspaceName){
public static ResponseResult deleteFlow(String flowName, String workspaceName){
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_DELETE,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_DELETE,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------", response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -192,27 +191,27 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String repealSchedule(String flowName, String workspaceName){
public static ResponseResult repealSchedule(String flowName, String workspaceName){
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_REPEAL,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_REPEAL,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
* 重新开始某次调度
* @param runId
* @return
*/
public static String startSchedule(String runId){
public static ResponseResult startSchedule(String runId){
Map<String,Object> map = new HashMap<>(5);
map.put("runId", runId);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_REREPEAL, JSON.toJSONString(map));
log.info("--------------------重新开始调度接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_REREPEAL, JSON.toJSONString(map));
log.info("--------------------重新开始调度接口调用成功，结果为：{}------------------------", response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -222,16 +221,16 @@ public class JobUtils {
* @param nodeName
* @return
*/
public static String killJob(String runId, String flowName, String nodeName){
public static ResponseResult killJob(String runId, String flowName, String nodeName){
//请求的路径
Map<String,String> map = new HashMap<>(5);
map.put("runId", runId);
map.put("flowName", flowName);
map.put("nodeName", nodeName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_KILL_JOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------杀死任务接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_KILL_JOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------杀死任务接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -239,13 +238,13 @@ public class JobUtils {
* @param runId
* @return
*/
public static String killFlow(String runId){
public static ResponseResult killFlow(String runId){
Map<String, Object> map = new HashMap<>(2);
map.put("runId", runId);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_KILL_FLOW, JSON.toJSONString(map));
log.info("--------------------杀死工作流接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_KILL_FLOW, JSON.toJSONString(map));
log.info("--------------------杀死工作流接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -257,7 +256,7 @@ public class JobUtils {
* @param nodeName
* @return
*/
public static String reRunJob(String runId, String runState, String workspaceName, String flowName, String nodeName){
public static ResponseResult reRunJob(String runId, String runState, String workspaceName, String flowName, String nodeName){
Map<String,String> map = new HashMap<>(5);
map.put("runId",runId);
map.put("runState",runState);
......@@ -265,9 +264,9 @@ public class JobUtils {
map.put("flowName",flowName);
map.put("nodeName",nodeName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_RERUNJOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_RERUNJOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
......@@ -278,15 +277,15 @@ public class JobUtils {
* @param flowName
* @return
*/
public static String reRunFlow(String runId, String workspaceName, String flowName){
public static ResponseResult reRunFlow(String runId, String workspaceName, String flowName){
Map<String,String> map = new HashMap<>(5);
map.put("runId",runId);
map.put("workspaceName",workspaceName);
map.put("flowName",flowName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_RERUNFLOW,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_RERUNFLOW,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -297,16 +296,16 @@ public class JobUtils {
* @param nodeName
* @return
*/
public static String makeSuccess(String runId, String workspaceName, String flowName, String nodeName){
public static ResponseResult makeSuccess(String runId, String workspaceName, String flowName, String nodeName){
Map<String,String> map = new HashMap<>(5);
map.put("runId",runId);
map.put("workspaceName",workspaceName);
map.put("flowName",flowName);
map.put("nodeName",nodeName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_FLOW_MAKESUCCESS,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------手动置为成功接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_FLOW_MAKESUCCESS,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------手动置为成功接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -314,12 +313,12 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String addWorkspace(String workspaceName){
public static ResponseResult addWorkspace(String workspaceName){
log.info("---------------开始创建工作空间,workspaceName:{}---------------------", workspaceName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_WORKSPACE_ADD, "workspaceName="+ workspaceName);
log.info("--------------------创建工作空间接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_WORKSPACE_ADD, "workspaceName="+ workspaceName);
log.info("--------------------创建工作空间接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -327,12 +326,12 @@ public class JobUtils {
* @param workspaceName
* @return
*/
public static String existWorkspace(String workspaceName){
public static ResponseResult existWorkspace(String workspaceName){
log.info("---------------判断工作空间是否存在,workspaceName:{}---------------------", workspaceName);
//发送请求 添加任务
String addRequestResult = createHttpRequest(REQUEST_WORKSPACE_EXIST, "workspaceName="+ workspaceName);
log.info("--------------------判断工作空间是否存在接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_WORKSPACE_EXIST, "workspaceName="+ workspaceName);
log.info("--------------------判断工作空间是否存在接口调用成功，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......@@ -346,7 +345,7 @@ public class JobUtils {
* @param jobType
* @return
*/
public static String realExectNode(String nodeId, String nodeName, String runCmd, String runParam, String scriptUrl, String runSource ,String jobType){
public static ResponseResult realExectNode(String nodeId, String nodeName, String runCmd, String runParam, String scriptUrl, String runSource ,String jobType){
log.info("---------------立即运行节点---------------------");
HashMap map = new HashMap(10);
map.put("nodeId", nodeId);
......@@ -357,9 +356,9 @@ public class JobUtils {
map.put("runSource", runSource);
map.put("jobType", jobType);
//立即运行节点
String addRequestResult = createHttpRequest(REQUEST_REAL_EXECT, "param=" + JSON.toJSONString(map));
log.info("--------------------立即运行节点，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String response = createHttpRequest(REQUEST_REAL_EXECT, "param=" + JSON.toJSONString(map));
log.info("--------------------立即运行节点，结果为：{}------------------------",response);
return JSON.parseObject(response, ResponseResult.class);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment