Skip to content

调度日志列表添加任务描述。 #3742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

调度日志列表添加任务描述。 #3742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public class XxlJobLog {

// job info
private int jobGroup;
private String jobDesc;
private int jobId;

// execute info
Expand Down Expand Up @@ -58,6 +59,14 @@ public void setJobId(int jobId) {
this.jobId = jobId;
}

public String getJobDesc() {
return jobDesc;
}

public void setJobDesc(String jobDesc) {
this.jobDesc = jobDesc;
}

public String getExecutorAddress() {
return executorAddress;
}
Expand Down
4 changes: 4 additions & 0 deletions xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<result column="job_group" property="jobGroup" />
<result column="job_id" property="jobId" />
<result column="job_desc" property="jobDesc" />

<result column="executor_address" property="executorAddress" />
<result column="executor_handler" property="executorHandler" />
Expand All @@ -30,6 +31,7 @@
t.id,
t.job_group,
t.job_id,
i.job_desc,
t.executor_address,
t.executor_handler,
t.executor_param,
Expand All @@ -47,6 +49,7 @@
<select id="pageList" resultMap="XxlJobLog">
SELECT <include refid="Base_Column_List" />
FROM xxl_job_log AS t
LEFT JOIN xxl_job_info AS i ON t.job_id = i.id
<trim prefix="WHERE" prefixOverrides="AND | OR" >
<if test="jobId==0 and jobGroup gt 0">
AND t.job_group = #{jobGroup}
Expand Down Expand Up @@ -113,6 +116,7 @@
<select id="load" parameterType="java.lang.Long" resultMap="XxlJobLog">
SELECT <include refid="Base_Column_List" />
FROM xxl_job_log AS t
LEFT JOIN xxl_job_info AS i ON t.job_id = i.id
WHERE t.id = #{id}
</select>

Expand Down
10 changes: 7 additions & 3 deletions xxl-job-admin/src/main/resources/static/js/joblog.index.1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ $(function() {
{
"data": 'jobId',
"visible" : true,
"width":'10%',
"width":'5%',
"render": function ( data, type, row ) {

var jobhandler = '';
Expand All @@ -112,9 +112,13 @@ $(function() {
}
},
{ "data": 'jobGroup', "visible" : false},
{
"data": 'jobDesc',
"width": '10%',
},
{
"data": 'triggerTime',
"width":'20%',
"width":'15%',
"render": function ( data, type, row ) {
return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
}
Expand Down Expand Up @@ -143,7 +147,7 @@ $(function() {
},
{
"data": 'handleTime',
"width":'20%',
"width":'15%',
"render": function ( data, type, row ) {
return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
}
Expand Down
1 change: 1 addition & 0 deletions xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<#--<th name="executorAddress" >执行器地址</th>
<th name="glueType" >运行模式</th>
<th name="executorParam" >任务参数</th>-->
<th name="jobDesc" >${I18n.jobinfo_field_jobdesc}</th>
<th name="triggerTime" >${I18n.joblog_field_triggerTime}</th>
<th name="triggerCode" >${I18n.joblog_field_triggerCode}</th>
<th name="triggerMsg" >${I18n.joblog_field_triggerMsg}</th>
Expand Down