Browse Source

任务开始时间

wuyi 1 year ago
parent
commit
13441a259b
2 changed files with 10 additions and 4 deletions
  1. 3 0
      src/task/entities/task.entity.ts
  2. 7 4
      src/task/task.service.ts

+ 3 - 0
src/task/entities/task.entity.ts

@@ -73,6 +73,9 @@ export class Task {
     @Column({ nullable: true })
     @Column({ nullable: true })
     matchDevice?: string
     matchDevice?: string
 
 
+    @CreateDateColumn()
+    startedAt: Date
+
     @Exclude()
     @Exclude()
     userName: string
     userName: string
 }
 }

+ 7 - 4
src/task/task.service.ts

@@ -197,7 +197,10 @@ export class TaskService implements OnModuleInit {
             }
             }
         })
         })
 
 
-        await this.taskRepository.update({ id }, { status: num > 0 ? TaskStatus.QUEUED : TaskStatus.PENDING })
+        await this.taskRepository.update({ id }, {
+            status: num > 0 ? TaskStatus.QUEUED : TaskStatus.PENDING,
+            startedAt: new Date()
+        })
     }
     }
 
 
     async pauseTask(id: number): Promise<void> {
     async pauseTask(id: number): Promise<void> {
@@ -271,7 +274,7 @@ export class TaskService implements OnModuleInit {
                 status: TaskStatus.QUEUED
                 status: TaskStatus.QUEUED
             },
             },
             order: {
             order: {
-                createdAt: 'ASC'
+                startedAt: 'ASC'
             }
             }
         })
         })
         if (tasks.length > 0) {
         if (tasks.length > 0) {
@@ -363,7 +366,7 @@ export class TaskService implements OnModuleInit {
                             status: TaskStatus.QUEUED
                             status: TaskStatus.QUEUED
                         },
                         },
                         order: {
                         order: {
-                            createdAt: 'ASC'
+                            startedAt: 'ASC'
                         }
                         }
                     })
                     })
                     // 异步执行startTask方法
                     // 异步执行startTask方法
@@ -493,7 +496,7 @@ export class TaskService implements OnModuleInit {
                                 status: TaskStatus.QUEUED
                                 status: TaskStatus.QUEUED
                             },
                             },
                             order: {
                             order: {
-                                createdAt: 'ASC'
+                                startedAt: 'ASC'
                             }
                             }
                         })
                         })
                         if (nextTask) {
                         if (nextTask) {