fix(controller): start end time of task always be -1 (#2336)

star-whale · Jun 9, 2023 · ff71a9e · ff71a9e
1 parent f18392c
commit ff71a9e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/...er/controller/src/main/java/ai/starwhale/mlops/domain/task/converter/TaskBoConverter.java b/...er/controller/src/main/java/ai/starwhale/mlops/domain/task/converter/TaskBoConverter.java
@@ -58,8 +58,10 @@ public Task transformTask(Step step, TaskEntity entity) {
                 .ip(entity.getIp())
                 .devWay(entity.getDevWay())
                 .build();
-        task.setStartTime(entity.getStartedTime().getTime());
-        task.setFinishTime(entity.getFinishedTime().getTime());
+        Long start = entity.getStartedTime() == null ? null : entity.getStartedTime().getTime();
+        Long finish = entity.getFinishedTime() == null ? null : entity.getFinishedTime().getTime();
+        task.setStartTime(start);
+        task.setFinishTime(finish);
         return task;
     }
 

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/task/converter/TaskConverter.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/task/converter/TaskConverter.java
@@ -68,11 +68,11 @@ public TaskVo convert(TaskEntity entity) {
                 .uuid(entity.getTaskUuid())
                 .taskStatus(entity.getTaskStatus())
                 .retryNum(entity.getRetryNum())
-                .finishedTime(entity.getFinishedTime().getTime())
+                .finishedTime(entity.getFinishedTime() == null ? null : entity.getFinishedTime().getTime())
                 .stepName(step.getName())
                 .devUrl(entity.getDevWay() != null && StringUtils.hasText(entity.getIp())
                         ? entity.getDevWay().toDevUrl(entity.getIp(), devPort) : null)
-                .startedTime(entity.getStartedTime().getTime())
+                .startedTime(entity.getStartedTime() == null ? null : entity.getStartedTime().getTime())
                 .resourcePool(pool)
                 .build();
     }

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/task/po/TaskEntity.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/task/po/TaskEntity.java
@@ -21,7 +21,6 @@
 import ai.starwhale.mlops.domain.task.status.TaskStatus;
 import java.util.Date;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -54,10 +53,8 @@ public class TaskEntity extends BaseEntity {
 
     private DevWay devWay;
 
-    @Builder.Default
-    private Date startedTime = defaultDate;
+    private Date startedTime;
 
-    @Builder.Default
-    private Date finishedTime = defaultDate;
+    private Date finishedTime;
 
 }