Merge pull request #43 from qq254963746/develop

Develop

Author: qq254963746

lts-admin/src/main/java/com/lts/web/controller/ui/UIController.java

@@ -39,17 +39,17 @@ public String addJobUI(Model model) {
 
     @RequestMapping("job-logger/job-logger")
     public String jobLoggerUI(Model model, String taskId, String taskTrackerNodeGroup,
-                              Date startTimestamp, Date endTimestamp) {
+                              Date startLogTime, Date endLogTime) {
         model.addAttribute("taskId", taskId);
         model.addAttribute("taskTrackerNodeGroup", taskTrackerNodeGroup);
-        if (startTimestamp == null) {
-            startTimestamp = DateUtils.addDay(new Date(), -3);
+        if (startLogTime == null) {
+            startLogTime = DateUtils.addDay(new Date(), -3);
         }
-        model.addAttribute("startTimestamp", DateUtils.formatYMD_HMS(startTimestamp));
-        if (endTimestamp == null) {
-            endTimestamp = new Date();
+        model.addAttribute("startLogTime", DateUtils.formatYMD_HMS(startLogTime));
+        if (endLogTime == null) {
+            endLogTime = new Date();
         }
-        model.addAttribute("endTimestamp", DateUtils.formatYMD_HMS(endTimestamp));
+        model.addAttribute("endLogTime", DateUtils.formatYMD_HMS(endLogTime));
         setAttr(model);
         return "job-logger";
     }

lts-admin/src/main/webapp/main/executable-job-queue.jsp

@@ -82,6 +82,9 @@
             },
             {title: 'cron表达式', dataIndex: 'cronExpression', width: 100},
             {title: '优先级', dataIndex: 'priority', width: 60},
+            {
+                title: '重试次数', dataIndex: 'retryTimes', width: 60
+            },
             {
                 title: '反馈客户端', dataIndex: 'needFeedback', width: 80, renderer: function (v) {
                 return v ? '需要' : '不需要';

lts-admin/src/main/webapp/main/executing-job-queue.jsp

@@ -91,6 +91,9 @@
                 return v ? '需要' : '不需要';
             }
             },
+            {
+                title: '重试次数', dataIndex: 'retryTimes', width: 60
+            },
             {
                 title: '用户参数', dataIndex: 'extParams', width: 140, sortable: false, renderer: function (v, obj) {
                 if (v) {

lts-admin/src/main/webapp/main/job-logger.jsp

@@ -33,9 +33,9 @@
                     <label class="control-label">日志记录时间：</label>
 
                     <div class="controls">
-                        <input type="text" class="calendar calendar-time" name="startTimestamp"
-                               value="${startTimestamp}"><span> -
-                        </span><input name="endTimestamp" value="${endTimestamp}" type="text"
+                        <input type="text" class="calendar calendar-time" name="startLogTime"
+                               value="${startLogTime}"><span> -
+                        </span><input name="endLogTime" value="${endLogTime}" type="text"
                                       class="calendar calendar-time">
                     </div>
                 </div>
@@ -92,6 +92,9 @@
             {
                 title: '日志级别', dataIndex: 'level', width: 60
             },
+            {
+                title: '重试次数', dataIndex: 'retryTimes', width: 60
+            },
             {
                 title: '优先级', dataIndex: 'priority', sortable: false, width: 60
             },

lts-admin/src/test/java/com/lts/biz/logger/mysql/MysqlJobLoggerTest.java

@@ -33,7 +33,8 @@ public void testLog() throws Exception {
         List<JobLogPo> jobLogPoList = new ArrayList<JobLogPo>();
 
         JobLogPo jobLogPo = new JobLogPo();
-        jobLogPo.setTimestamp(DateUtils.currentTimeMillis());
+        jobLogPo.setGmtCreated(DateUtils.currentTimeMillis());
+        jobLogPo.setLogTime(DateUtils.currentTimeMillis());
         jobLogPo.setLevel(Level.INFO);
         jobLogPo.setLogType(LogType.BIZ);
         jobLogPoList.add(jobLogPo);

lts-core/src/main/java/com/lts/core/constant/Constants.java

@@ -80,4 +80,9 @@ public interface Constants {
     public static final String JOB_TAKE_PARALLEL_SIZE = "job.take.parallel.size";
     public static final String JOB_TAKE_ACQUIRE_TIMEOUT = "job.take.acquire.timeout";
     public static final int DEFAULT_JOB_TAKE_PARALLEL_SIZE = 20;
+
+    // 任务最多重试次数
+    public static final String JOB_MAX_RETRY_TIMES = "job.max.retry.times";
+    public static final int DEFAULT_JOB_MAX_RETRY_TIMES = 10;
+
 }

lts-core/src/main/java/com/lts/core/domain/Action.java

@@ -0,0 +1,13 @@
+package com.lts.core.domain;
+
+/**
+ * @author Robert HG (254963746@qq.com) on 6/13/15.
+ */
+public enum Action {
+
+    EXECUTE_SUCCESS,    // 执行成功,这种情况 直接反馈客户端
+    EXECUTE_FAILED,     // 执行失败,这种情况,直接反馈给客户端,不重新执行
+    EXECUTE_LATER,       // 稍后重新执行,这种情况, 不反馈客户端,稍后重新执行,不过有最大重试次数
+    EXECUTE_EXCEPTION   // 执行异常, 这中情况也会重试
+
+}

lts-core/src/main/java/com/lts/core/domain/BizLog.java

@@ -17,7 +17,7 @@ public class BizLog implements Serializable {
 
     private Level level;
 
-    private Long timestamp;
+    private Long logTime;
 
     private String taskTrackerIdentity;
 
@@ -55,12 +55,12 @@ public void setLevel(Level level) {
         this.level = level;
     }
 
-    public Long getTimestamp() {
-        return timestamp;
+    public Long getLogTime() {
+        return logTime;
     }
 
-    public void setTimestamp(Long timestamp) {
-        this.timestamp = timestamp;
+    public void setLogTime(Long logTime) {
+        this.logTime = logTime;
     }
 
     public String getTaskTrackerIdentity() {

lts-core/src/main/java/com/lts/core/domain/Job.java

@@ -17,21 +17,22 @@
 public class Job {
 
     @NotNull
-    protected String taskId;
+    private String taskId;
     /**
      * 优先级 (数值越大 优先级越低)
      */
-    protected Integer priority = 100;
+    private Integer priority = 100;
     // 提交的节点 （可以手动指定）
-    protected String submitNodeGroup;
+    private String submitNodeGroup;
     // 执行的节点
     @NotNull
-    protected String taskTrackerNodeGroup;
+    private String taskTrackerNodeGroup;
 
-    protected Map<String, String> extParams;
+    private Map<String, String> extParams;
     // 是否要反馈给客户端
-    protected boolean needFeedback = true;
-
+    private boolean needFeedback = true;
+    // 重试次数
+    private int retryTimes;
     /**
      * 执行表达式 和 quartz 的一样
      * 如果这个为空，表示立即执行的
@@ -80,6 +81,14 @@ public boolean isNeedFeedback() {
         return needFeedback;
     }
 
+    public Integer getRetryTimes() {
+        return retryTimes;
+    }
+
+    public void setRetryTimes(int retryTimes) {
+        this.retryTimes = retryTimes;
+    }
+
     public void setNeedFeedback(boolean needFeedback) {
         this.needFeedback = needFeedback;
     }
@@ -118,8 +127,8 @@ public boolean isSchedule() {
         return this.cronExpression != null && !"".equals(this.cronExpression.trim());
     }
 
-    public void setTriggerTime(Date date){
-        if(date != null){
+    public void setTriggerTime(Date date) {
+        if (date != null) {
             this.triggerTime = date.getTime();
         }
     }

lts-core/src/main/java/com/lts/core/domain/TaskTrackerJobResult.java

@@ -10,8 +10,7 @@ public class TaskTrackerJobResult {
 
     private JobWrapper jobWrapper;
 
-    // 执行成功还是失败
-    private boolean success;
+    private Action action;
 
     private String msg;
     // 任务完成时间
@@ -25,12 +24,12 @@ public void setJobWrapper(JobWrapper jobWrapper) {
         this.jobWrapper = jobWrapper;
     }
 
-    public boolean isSuccess() {
-        return success;
+    public Action getAction() {
+        return action;
     }
 
-    public void setSuccess(boolean success) {
-        this.success = success;
+    public void setAction(Action action) {
+        this.action = action;
     }
 
     public String getMsg() {