Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
fb867587
Commit
fb867587
authored
Apr 16, 2020
by
guo_minglei@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改错误
parent
8fcd3190
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
ApiNodeServiceImpl.java
...c/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
+1
-1
JavaTaskMapper.xml
...h-admin-core/src/main/resources/mapper/JavaTaskMapper.xml
+1
-1
JobTaskRunLogMapper.xml
...in-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
+2
-2
JobUtils.java
...xecutor-plugin/src/main/java/com/byit/utils/JobUtils.java
+9
-9
No files found.
byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java
View file @
fb867587
...
@@ -219,7 +219,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
...
@@ -219,7 +219,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
schedule
.
setJobType
(
NodeTypeEnum
.
JAVA
.
getCode
());
schedule
.
setJobType
(
NodeTypeEnum
.
JAVA
.
getCode
());
schedule
.
setTriggerTime
(
triggerTime
);
schedule
.
setTriggerTime
(
triggerTime
);
schedule
.
setScheduleType
(
ScheduleTypeEnum
.
JAVA_SYNC
.
getCode
());
schedule
.
setScheduleType
(
ScheduleTypeEnum
.
JAVA_SYNC
.
getCode
());
schedule
.
setPriority
(
"1"
);
schedule
.
setRunParam
(
PlaceholderUtils
.
formatParam
(
javaTask
.
getParam
()));
schedule
.
setRunParam
(
PlaceholderUtils
.
formatParam
(
javaTask
.
getParam
()));
JobTaskRunLogWithBLOBs
jobTaskRunLog
=
new
JobTaskRunLogWithBLOBs
();
JobTaskRunLogWithBLOBs
jobTaskRunLog
=
new
JobTaskRunLogWithBLOBs
();
...
...
byit-myth-core/myth-admin-core/src/main/resources/mapper/JavaTaskMapper.xml
View file @
fb867587
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
alarm_email = #{alarmEmail,jdbcType=VARCHAR},
alarm_email = #{alarmEmail,jdbcType=VARCHAR},
</if>
</if>
</set>
</set>
where job_name = #{jobName,jdbcType=VARCHAR}
,
where job_name = #{jobName,jdbcType=VARCHAR}
</update>
</update>
<select
id=
"findByJobName"
resultMap=
"BaseResultMap"
>
<select
id=
"findByJobName"
resultMap=
"BaseResultMap"
>
...
...
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
View file @
fb867587
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
<select
id=
"findJavaTaskByJobName"
resultMap=
"BaseResultMap"
>
<select
id=
"findJavaTaskByJobName"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
select
<include
refid=
"Base_Column_List"
/>
from job_task_run_log
from job_task_run_log
where node
I
d = #{nodeId}
where node
_i
d = #{nodeId}
and start_time
>
= #{startTime}
and start_time
>
= #{startTime}
and end_time
<
= #{endTime}
and end_time
<
= #{endTime}
and schedule_type = '5'
and schedule_type = '5'
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
<select
id=
"findJavaTaskByTaskName"
resultMap=
"BaseResultMap"
>
<select
id=
"findJavaTaskByTaskName"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
select
<include
refid=
"Base_Column_List"
/>
from job_task_run_log
from job_task_run_log
where node
I
d in (
where node
_i
d in (
<foreach
collection=
"nodeIdList"
item=
"nodeId"
separator=
","
>
<foreach
collection=
"nodeIdList"
item=
"nodeId"
separator=
","
>
#{nodeId}
#{nodeId}
</foreach>
</foreach>
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java
View file @
fb867587
...
@@ -112,32 +112,32 @@ public class JobUtils {
...
@@ -112,32 +112,32 @@ public class JobUtils {
/**
/**
* 添加任务
* 添加任务
*/
*/
private
static
final
String
REQUEST_ADD_JAVATASK
=
"api/node/addJavaTask"
;
private
static
final
String
REQUEST_ADD_JAVATASK
=
"
/
api/node/addJavaTask"
;
/**
/**
* 修改任务
* 修改任务
*/
*/
private
static
final
String
REQUEST_UPDATE_JAVATASK
=
"api/node/updateJavaTask"
;
private
static
final
String
REQUEST_UPDATE_JAVATASK
=
"
/
api/node/updateJavaTask"
;
/**
/**
* 删除任务
* 删除任务
*/
*/
private
static
final
String
REQUEST_DELETE_JAVATASK
=
"api/node/deleteJavaTask"
;
private
static
final
String
REQUEST_DELETE_JAVATASK
=
"
/
api/node/deleteJavaTask"
;
/**
/**
* 判断是否存在任务, 存在 true 不存在 false
* 判断是否存在任务, 存在 true 不存在 false
*/
*/
private
static
final
String
REQUEST_EXIST_JAVATASK
=
"api/node/existJavaTask"
;
private
static
final
String
REQUEST_EXIST_JAVATASK
=
"
/
api/node/existJavaTask"
;
/**
/**
* 根据jobName获取日志
* 根据jobName获取日志
*/
*/
private
static
final
String
REQUEST_LOADLOG_JOBNAME
=
"api/node/loadLogByJobName"
;
private
static
final
String
REQUEST_LOADLOG_JOBNAME
=
"
/
api/node/loadLogByJobName"
;
/**
/**
* 根据taskName获取日志
* 根据taskName获取日志
*/
*/
private
static
final
String
REQUEST_LOADLOG_TASKNAME
=
"api/node/loadLogByTaskName"
;
private
static
final
String
REQUEST_LOADLOG_TASKNAME
=
"
/
api/node/loadLogByTaskName"
;
/**
/**
* 立即运行quartz任务
* 立即运行quartz任务
*/
*/
private
static
final
String
REQUEST_RUN_JAVATASK
=
"api/node/runJavaTask"
;
private
static
final
String
REQUEST_RUN_JAVATASK
=
"
/
api/node/runJavaTask"
;
/**
/**
* 当前项目运行环境 jar file
* 当前项目运行环境 jar file
*/
*/
...
@@ -521,7 +521,7 @@ public class JobUtils {
...
@@ -521,7 +521,7 @@ public class JobUtils {
*/
*/
public
static
ResponseResult
deleteJavaTask
(
String
jobName
){
public
static
ResponseResult
deleteJavaTask
(
String
jobName
){
log
.
info
(
"-------------删除任务----------------------"
);
log
.
info
(
"-------------删除任务----------------------"
);
String
response
=
createHttpRequest
(
REQUEST_DELETE_JAVATASK
,
"
param
="
+
jobName
);
String
response
=
createHttpRequest
(
REQUEST_DELETE_JAVATASK
,
"
jobName
="
+
jobName
);
log
.
info
(
"--------------------删除任务,结果为:{}------------------------"
,
response
);
log
.
info
(
"--------------------删除任务,结果为:{}------------------------"
,
response
);
return
JSON
.
parseObject
(
response
,
ResponseResult
.
class
);
return
JSON
.
parseObject
(
response
,
ResponseResult
.
class
);
}
}
...
@@ -535,7 +535,7 @@ public class JobUtils {
...
@@ -535,7 +535,7 @@ public class JobUtils {
*/
*/
public
static
ResponseResult
existJavaTask
(
String
jobName
){
public
static
ResponseResult
existJavaTask
(
String
jobName
){
log
.
info
(
"-------------判断是否存在任务----------------------"
);
log
.
info
(
"-------------判断是否存在任务----------------------"
);
String
response
=
createHttpRequest
(
REQUEST_EXIST_JAVATASK
,
"
param
="
+
jobName
);
String
response
=
createHttpRequest
(
REQUEST_EXIST_JAVATASK
,
"
jobName
="
+
jobName
);
log
.
info
(
"--------------------判断是否存在任务,结果为:{}------------------------"
,
response
);
log
.
info
(
"--------------------判断是否存在任务,结果为:{}------------------------"
,
response
);
return
JSON
.
parseObject
(
response
,
ResponseResult
.
class
);
return
JSON
.
parseObject
(
response
,
ResponseResult
.
class
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment