Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415

escheduler-common/src/main/java/cn/escheduler/common/utils/DateUtils.java

@@ -72,7 +72,7 @@ public class DateUtils {
 	public static Date parse(String date,String format){
 		try {
 			return new SimpleDateFormat(format).parse(date);
-		} catch (ParseException e) {
+		} catch (Exception e) {
 			logger.error("error while parse date:" + date, e);
 		}
 		return null;

escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java

@@ -17,6 +17,7 @@
 package cn.escheduler.dao;
 
 import cn.escheduler.common.Constants;
+import cn.escheduler.common.utils.DateUtils;
 import cn.escheduler.dao.model.TaskRecord;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
@@ -201,8 +202,8 @@ public class TaskRecordDao {
         taskRecord.setProcId(resultSet.getInt("PROC_ID"));
         taskRecord.setProcName(resultSet.getString("PROC_NAME"));
         taskRecord.setProcDate(resultSet.getString("PROC_DATE"));
-        taskRecord.setStartDate(resultSet.getDate("STARTDATE"));
+        taskRecord.setStartTime(DateUtils.stringToDate(resultSet.getString("STARTDATE")));
-        taskRecord.setEndDate(resultSet.getDate("ENDDATE"));
+        taskRecord.setEndTime(DateUtils.stringToDate(resultSet.getString("ENDDATE")));
         taskRecord.setResult(resultSet.getString("RESULT"));
         taskRecord.setDuration(resultSet.getInt("DURATION"));
         taskRecord.setNote(resultSet.getString("NOTE"));

escheduler-dao/src/main/java/cn/escheduler/dao/model/TaskRecord.java

@@ -46,12 +46,12 @@ public class TaskRecord {
     /**
      * start date
      */
-    private Date startDate;
+    private Date startTime;
 
     /**
      * end date
      */
-    private Date endDate;
+    private Date endTime;
 
     /**
      * result
@@ -136,20 +136,20 @@ public class TaskRecord {
         this.procDate = procDate;
     }
 
-    public Date getStartDate() {
+    public Date getStartTime() {
-        return startDate;
+        return startTime;
     }
 
-    public void setStartDate(Date startDate) {
+    public void setStartTime(Date startTime) {
-        this.startDate = startDate;
+        this.startTime = startTime;
     }
 
-    public Date getEndDate() {
+    public Date getEndTime() {
-        return endDate;
+        return endTime;
     }
 
-    public void setEndDate(Date endDate) {
+    public void setEndTime(Date endTime) {
-        this.endDate = endDate;
+        this.endTime = endTime;
     }
 
     public String getResult() {
@@ -238,8 +238,8 @@ public class TaskRecord {
                 +" proc id:" + procId
                 + " proc name:" + procName
                 + " proc date: " + procDate
-                + " start date:" + startDate
+                + " start date:" + startTime
-                + " end date:" + endDate
+                + " end date:" + endTime
                 + " result : " + result
                 + " duration : " + duration
                 + " note : " + note