Skip to content

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

提交工具修改

parent 40467a8b
Showing with 36 additions and 47 deletions
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
......@@ -11,6 +11,9 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* @author guo_m
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class ApiNodeServiceImpl implements ApiNodeService {
......
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;
......@@ -24,6 +25,7 @@ import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
@Slf4j
public class JobUtils {
private static String REQUEST_URL;
private static String TOKEN;
private static final String REQUEST_ADD_JOB_RESOURCES_SUFFIX = "/job/addJob";
/**
* 发布工作流
......@@ -87,6 +89,20 @@ public class JobUtils {
REQUEST_URL = requestUrl;
}
public static void setTOKEN(String token){
TOKEN = token;
}
private static String createHttpRequest(String requestUrl, String body){
ValidationUtil.dataNotBank(REQUEST_URL, "请求调度中心的地址尚未设置！");
ValidationUtil.dataNotBank(TOKEN, "请求的token尚未设置！");
HttpRequest httpRequest = HttpRequest.post(REQUEST_URL + requestUrl);
httpRequest.header("token", TOKEN);
String response = httpRequest.body(body).execute().body();
return response;
}
/**
* 添加一个任务节点
* @param pluginBeanJobInfo 任务节点的详尽配置
......@@ -94,10 +110,8 @@ public class JobUtils {
*/
public static String addJob(PluginBeanJobInfo pluginBeanJobInfo){
log.info("---------------开始添加一个任务,jobHandelName:{}---------------------", pluginBeanJobInfo.getJobHandelName());
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_ADD_JOB_RESOURCES_SUFFIX;
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginBeanJobInfo));
String addRequestResult = createHttpRequest(REQUEST_ADD_JOB_RESOURCES_SUFFIX, JSON.toJSONString(pluginBeanJobInfo));
log.info("--------------------添加任务完成，添加结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -110,13 +124,11 @@ public class JobUtils {
public static String publish(PluginPackage pluginPackage){
log.info("---------------开始发布工作流,flowName:{}---------------------", pluginPackage.getFlow().getName());
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_PUBLISH;
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl, "param=" + JSON.toJSONString(pluginPackage, WriteClassName));
String publishRequestResult = createHttpRequest(REQUEST_FLOW_PUBLISH, "param=" + JSON.toJSONString(pluginPackage, WriteClassName));
//String addRequestResult = HttpUtil.post(requestUrl, JSON.toJSONString(pluginPackage, WriteClassName))
log.info("--------------------添加任务完成，添加结果为：{}------------------------",addRequestResult);
return addRequestResult;
log.info("--------------------添加任务完成，添加结果为：{}------------------------", publishRequestResult);
return publishRequestResult;
}
/**
......@@ -126,15 +138,13 @@ public class JobUtils {
* @return
*/
public static String startFlow(String flowName, String workspaceName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_START;
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------开始接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
String startRequestResult = createHttpRequest(REQUEST_FLOW_START, "param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------开始接口调用成功，结果为：{}------------------------", startRequestResult);
return startRequestResult;
}
/**
......@@ -144,13 +154,11 @@ public class JobUtils {
* @return
*/
public static String stopFlow(String flowName, String workspaceName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_STOP;
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
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;
......@@ -163,13 +171,11 @@ public class JobUtils {
* @return
*/
public static String deleteFlow(String flowName, String workspaceName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_DELETE;
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_DELETE,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -181,13 +187,11 @@ public class JobUtils {
* @return
*/
public static String repealSchedule(String flowName, String workspaceName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_REPEAL;
Map<String,String> map = new HashMap<>(5);
map.put("flowName",flowName);
map.put("workspaceName",workspaceName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_REPEAL,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------删除接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -197,12 +201,10 @@ public class JobUtils {
* @return
*/
public static String startSchedule(String runId){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_REREPEAL;
Map<String,Object> map = new HashMap<>(5);
map.put("runId", runId);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl, map);
String addRequestResult = createHttpRequest(REQUEST_FLOW_REREPEAL, JSON.toJSONString(map));
log.info("--------------------重新开始调度接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -216,13 +218,12 @@ public class JobUtils {
*/
public static String killJob(String runId, String flowName, String nodeName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_KILL_JOB;
Map<String,String> map = new HashMap<>(5);
map.put("runId", runId);
map.put("flowName", flowName);
map.put("nodeName", nodeName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_KILL_JOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------杀死任务接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -233,12 +234,10 @@ public class JobUtils {
* @return
*/
public static String killFlow(String runId){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_KILL_FLOW;
Map<String, Object> map = new HashMap<>(2);
map.put("runId", runId);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl, map);
String addRequestResult = createHttpRequest(REQUEST_FLOW_KILL_FLOW, JSON.toJSONString(map));
log.info("--------------------杀死工作流接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -253,8 +252,6 @@ public class JobUtils {
* @return
*/
public static String reRunJob(String runId, String runState, String workspaceName, String flowName, String nodeName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_RERUNJOB;
Map<String,String> map = new HashMap<>(5);
map.put("runId",runId);
map.put("runState",runState);
......@@ -262,7 +259,7 @@ public class JobUtils {
map.put("flowName",flowName);
map.put("nodeName",nodeName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_RERUNJOB,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -276,14 +273,12 @@ public class JobUtils {
* @return
*/
public static String reRunFlow(String runId, String workspaceName, String flowName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_RERUNFLOW;
Map<String,String> map = new HashMap<>(5);
map.put("runId",runId);
map.put("workspaceName",workspaceName);
map.put("flowName",flowName);
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_RERUNFLOW,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------重跑节点接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -297,15 +292,13 @@ public class JobUtils {
* @return
*/
public static String makeSuccess(String runId, String workspaceName, String flowName, String nodeName){
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_FLOW_MAKESUCCESS;
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 = HttpUtil.post(requestUrl,"param="+JSON.toJSONString(map,WriteClassName));
String addRequestResult = createHttpRequest(REQUEST_FLOW_MAKESUCCESS,"param="+JSON.toJSONString(map,WriteClassName));
log.info("--------------------手动置为成功接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
......@@ -317,19 +310,12 @@ public class JobUtils {
*/
public static String addWorkspace(String workspaceName){
log.info("---------------开始创建工作空间,workspaceName:{}---------------------", workspaceName);
//请求的路径
String requestUrl = REQUEST_URL + REQUEST_WORKSPACE_ADD;
//发送请求 添加任务
String addRequestResult = HttpUtil.post(requestUrl, "workspaceName="+ workspaceName);
String addRequestResult = createHttpRequest(REQUEST_WORKSPACE_ADD, "workspaceName="+ workspaceName);
log.info("--------------------创建工作空间接口调用成功，结果为：{}------------------------",addRequestResult);
return addRequestResult;
}
private static void checkRequestUrl(){
}
/**
* 判断当前的运行环境是什么 jar : table of Contents(目录)
* @return jar -->true 目录 -->false
......
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