|
|
@@ -1,6 +1,7 @@
|
|
1
|
1
|
package com.xxl.job.controller;
|
|
2
|
2
|
|
|
3
|
3
|
import java.text.ParseException;
|
|
|
4
|
+import java.util.Calendar;
|
|
4
|
5
|
import java.util.Date;
|
|
5
|
6
|
import java.util.HashMap;
|
|
6
|
7
|
import java.util.List;
|
|
|
@@ -47,6 +48,15 @@ public class JobLogController {
|
|
47
|
48
|
|
|
48
|
49
|
@RequestMapping
|
|
49
|
50
|
public String index(Model model, String jobName, String filterTime) {
|
|
|
51
|
+
|
|
|
52
|
+ // 默认filterTime
|
|
|
53
|
+ Calendar todayz = Calendar.getInstance();
|
|
|
54
|
+ todayz.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
55
|
+ todayz.set(Calendar.MINUTE, 0);
|
|
|
56
|
+ todayz.set(Calendar.SECOND, 0);
|
|
|
57
|
+ model.addAttribute("triggerTimeStart", todayz.getTime());
|
|
|
58
|
+ model.addAttribute("triggerTimeEnd", Calendar.getInstance().getTime());
|
|
|
59
|
+
|
|
50
|
60
|
model.addAttribute("jobName", jobName);
|
|
51
|
61
|
model.addAttribute("filterTime", filterTime);
|
|
52
|
62
|
return "joblog/index";
|