CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-06-13 21:00:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

增加普通javabean任务支持

Browse Source
This commit is contained in:
Locki 2020-09-16 11:32:58 +08:00
parent a665f406de
commit b66c3ec11b
14 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datax-admin/src/main/java/com/wugui/datax/admin/core/kill/KillJob.java
View File

@ -26,7 +26,7 @@ public class KillJob {
triggerParam.setExecutorHandler("killJobHandler");
triggerParam.setProcessId(processId);
triggerParam.setLogId(logId);
triggerParam.setGlueType(GlueTypeEnum.BEAN.getDesc());
triggerParam.setGlueType(GlueTypeEnum.DATAX.getDesc());
triggerParam.setExecutorBlockStrategy(ExecutorBlockStrategyEnum.SERIAL_EXECUTION.getTitle());
triggerParam.setLogDateTime(triggerTime.getTime());
if (address != null) {

2
datax-admin/src/main/java/com/wugui/datax/admin/core/trigger/JobTrigger.java
View File

@ -50,7 +50,7 @@ public class JobTrigger {
logger.warn(">>>>>>>>>>>> trigger fail, jobId invalid，jobId={}", jobId);
return;
}
if (GlueTypeEnum.BEAN.getDesc().equals(jobInfo.getGlueType())) {
if (GlueTypeEnum.DATAX.getDesc().equals(jobInfo.getGlueType())) {
//解密账密
String json = JSONUtils.changeJson(jobInfo.getJobJson(), JSONUtils.decrypt);
jobInfo.setJobJson(json);

10
datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobServiceImpl.java
View File

@ -72,6 +72,7 @@ public class JobServiceImpl implements JobService {
return maps;
}
@Override
public List<JobInfo> list() {
return jobInfoMapper.findAll();
}
@ -86,7 +87,7 @@ public class JobServiceImpl implements JobService {
if (!CronExpression.isValidExpression(jobInfo.getJobCron())) {
return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_invalid"));
}
if (jobInfo.getGlueType().equals(GlueTypeEnum.BEAN.getDesc()) && jobInfo.getJobJson().trim().length() <= 2) {
if (jobInfo.getGlueType().equals(GlueTypeEnum.DATAX.getDesc()) && jobInfo.getJobJson().trim().length() <= 2) {
return new ReturnT<>(ReturnT.FAIL_CODE, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_field_jobjson")));
}
if (jobInfo.getJobDesc() == null || jobInfo.getJobDesc().trim().length() == 0) {
@ -104,7 +105,8 @@ public class JobServiceImpl implements JobService {
if (GlueTypeEnum.match(jobInfo.getGlueType()) == null) {
return new ReturnT<>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_gluetype") + I18nUtil.getString("system_invalid")));
}
if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobInfo.getGlueType()) && (jobInfo.getExecutorHandler() == null || jobInfo.getExecutorHandler().trim().length() == 0)) {
if ((GlueTypeEnum.DATAX == GlueTypeEnum.match(jobInfo.getGlueType()) || GlueTypeEnum.JAVA_BEAN == GlueTypeEnum.match(jobInfo.getGlueType()))
&& (jobInfo.getExecutorHandler() == null || jobInfo.getExecutorHandler().trim().length() == 0)) {
return new ReturnT<>(ReturnT.FAIL_CODE, (I18nUtil.getString("system_please_input") + "JobHandler"));
}
@ -173,7 +175,7 @@ public class JobServiceImpl implements JobService {
if (!CronExpression.isValidExpression(jobInfo.getJobCron())) {
return new ReturnT<>(ReturnT.FAIL_CODE, I18nUtil.getString("jobinfo_field_cron_invalid"));
}
if (jobInfo.getGlueType().equals(GlueTypeEnum.BEAN.getDesc()) && jobInfo.getJobJson().trim().length() <= 2) {
if (jobInfo.getGlueType().equals(GlueTypeEnum.DATAX.getDesc()) && jobInfo.getJobJson().trim().length() <= 2) {
return new ReturnT<>(ReturnT.FAIL_CODE, (I18nUtil.getString("system_please_input") + I18nUtil.getString("jobinfo_field_jobjson")));
}
if (jobInfo.getJobDesc() == null || jobInfo.getJobDesc().trim().length() == 0) {
@ -253,7 +255,7 @@ public class JobServiceImpl implements JobService {
exists_jobInfo.setTriggerNextTime(nextTriggerTime);
exists_jobInfo.setUpdateTime(new Date());
if (GlueTypeEnum.BEAN.getDesc().equals(jobInfo.getGlueType())) {
if (GlueTypeEnum.DATAX.getDesc().equals(jobInfo.getGlueType()) || GlueTypeEnum.JAVA_BEAN.getDesc().equals(jobInfo.getGlueType())) {
exists_jobInfo.setJobJson(jobInfo.getJobJson());
exists_jobInfo.setGlueSource(null);
} else {

2
datax-admin/src/main/java/com/wugui/datax/admin/service/impl/JobTemplateServiceImpl.java
View File

@ -80,7 +80,7 @@ public class JobTemplateServiceImpl implements JobTemplateService {
if (GlueTypeEnum.match(jobTemplate.getGlueType()) == null) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_gluetype") + I18nUtil.getString("system_invalid")));
}
if (GlueTypeEnum.BEAN == GlueTypeEnum.match(jobTemplate.getGlueType()) && (jobTemplate.getExecutorHandler() == null || jobTemplate.getExecutorHandler().trim().length() == 0)) {
if (GlueTypeEnum.DATAX == GlueTypeEnum.match(jobTemplate.getGlueType()) && (jobTemplate.getExecutorHandler() == null || jobTemplate.getExecutorHandler().trim().length() == 0)) {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("system_please_input") + "JobHandler"));
}

2
datax-admin/src/main/resources/static/index.html
View File

File diff suppressed because one or more lines are too long

0
datax-admin/src/main/resources/static/static/js/chunk-2d0db496.2bf6de61.js → datax-admin/src/main/resources/static/static/js/chunk-2d0db496.4a01f556.js
View File

0
datax-admin/src/main/resources/static/static/js/chunk-35cb90ad.76cbbe16.js → datax-admin/src/main/resources/static/static/js/chunk-35cb90ad.73011621.js
View File

2
datax-admin/src/main/resources/static/static/js/chunk-3a8a15ea.bbc0f843.js → datax-admin/src/main/resources/static/static/js/chunk-3a8a15ea.060cf6f5.js
View File

File diff suppressed because one or more lines are too long

1
datax-admin/src/main/resources/static/static/js/chunk-6ace4dde.0ced191b.js Normal file
View File

File diff suppressed because one or more lines are too long

1
datax-admin/src/main/resources/static/static/js/chunk-6ace4dde.23eea700.js
View File

File diff suppressed because one or more lines are too long

2
datax-admin/src/test/java/com/wugui/executor/ExecutorBizTest.java
View File

@ -41,7 +41,7 @@ public class ExecutorBizTest {
triggerParam.setExecutorHandler(jobHandler);
triggerParam.setExecutorParams(params);
triggerParam.setExecutorBlockStrategy(ExecutorBlockStrategyEnum.COVER_EARLY.name());
triggerParam.setGlueType(GlueTypeEnum.BEAN.name());
triggerParam.setGlueType(GlueTypeEnum.DATAX.name());
triggerParam.setGlueSource(null);
triggerParam.setGlueUpdatetime(System.currentTimeMillis());
triggerParam.setLogId(1);

2
datax-core/src/main/java/com/wugui/datatx/core/biz/impl/ExecutorBizImpl.java
View File

@ -72,7 +72,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
// valid：jobHandler + jobThread
GlueTypeEnum glueTypeEnum = GlueTypeEnum.match(triggerParam.getGlueType());
if (GlueTypeEnum.BEAN == glueTypeEnum) {
if (GlueTypeEnum.DATAX == glueTypeEnum || GlueTypeEnum.JAVA_BEAN == glueTypeEnum) {
// new jobhandler
IJobHandler newJobHandler = JobExecutor.loadJobHandler(triggerParam.getExecutorHandler());

3
datax-core/src/main/java/com/wugui/datatx/core/glue/GlueTypeEnum.java
View File

@ -5,7 +5,8 @@ package com.wugui.datatx.core.glue;
*/
public enum GlueTypeEnum {
BEAN("BEAN", false, null, null),
JAVA_BEAN("JAVA_BEAN", false, null, null),
DATAX("DATAX", false, null, null),
GLUE_GROOVY("GLUE(Java)", false, null, null),
GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),

2
datax-core/src/test/java/com/wugui/datax/impl/ExecutorBizImplTest.java
View File

@ -129,7 +129,7 @@ public class ExecutorBizImplTest {
triggerParam.setExecutorHandler("demoJobHandler");
triggerParam.setExecutorParams(null);
triggerParam.setExecutorBlockStrategy(ExecutorBlockStrategyEnum.COVER_EARLY.name());
triggerParam.setGlueType(GlueTypeEnum.BEAN.name());
triggerParam.setGlueType(GlueTypeEnum.DATAX.name());
triggerParam.setGlueSource(null);
triggerParam.setGlueUpdatetime(System.currentTimeMillis());
triggerParam.setLogId(1);