feat: 调度中心-调度日志增加执行器显示列

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -33,6 +33,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * index controller
@@ -110,6 +111,11 @@ public class JobLogController {
 		
 		// page query
 		List<XxlJobLog> list = xxlJobLogDao.pageList(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
+		if (list != null && !list.isEmpty()) {
+			List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
+			Map<Integer, String> groupMap = groupList.stream().parallel().collect(Collectors.toMap(XxlJobGroup::getId, XxlJobGroup::getTitle));
+            list.stream().filter(l -> groupMap.containsKey(l.getJobGroup())).forEach(l -> l.setJobTitle(groupMap.get(l.getJobGroup())));
+        }
 		int list_count = xxlJobLogDao.pageListCount(start, length, jobGroup, jobId, triggerTimeStart, triggerTimeEnd, logStatus);
 		
 		// package result

xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java

@@ -11,6 +11,7 @@ public class XxlJobLog {
 	private long id;
 	
 	// job info
+	private String jobTitle;
 	private int jobGroup;
 	private int jobId;
 
@@ -42,6 +43,14 @@ public class XxlJobLog {
 		this.id = id;
 	}
 
+	public String getJobTitle() {
+		return jobTitle;
+	}
+
+	public void setJobTitle(String jobTitle) {
+		this.jobTitle = jobTitle;
+	}
+
 	public int getJobGroup() {
 		return jobGroup;
 	}

xxl-job-admin/src/main/resources/static/js/joblog.index.1.js

@@ -95,7 +95,7 @@ $(function() {
 					{
 						"data": 'jobId',
 						"visible" : true,
-                        "width":'10%',
+                        "width":'5%',
 						"render": function ( data, type, row ) {
 
 							var jobhandler = '';
@@ -111,10 +111,11 @@ $(function() {
 							return '<a class="logTips" href="javascript:;" >'+ row.jobId +'<span style="display:none;">'+ temp +'</span></a>';
 						}
 					},
+					{"data": 'jobTitle', "width": '10%', "visible": true},
 					{ "data": 'jobGroup', "visible" : false},
 					{
 						"data": 'triggerTime',
-                        "width":'20%',
+                        "width":'12%',
 						"render": function ( data, type, row ) {
 							return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
 						}
@@ -143,7 +144,7 @@ $(function() {
 					},
 	                { 
 	                	"data": 'handleTime',
-                        "width":'20%',
+                        "width":'12%',
 	                	"render": function ( data, type, row ) {
 	                		return data?moment(data).format("YYYY-MM-DD HH:mm:ss"):"";
 	                	}

xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl

@@ -87,6 +87,7 @@
 				                <thead>
 					            	<tr>
                                         <th name="jobId" >${I18n.jobinfo_field_id}</th>
+                                        <th name="jobTitle" >${I18n.jobinfo_field_jobgroup}</th>
                                         <th name="jobGroup" >jobGroup</th>
 										<#--<th name="executorAddress" >执行器地址</th>
 										<th name="glueType" >运行模式</th>