This commit is contained in:
2022-11-04 09:25:26 +08:00
parent 7d10b53028
commit 31e08a2028
9 changed files with 68 additions and 38 deletions

View File

@@ -14,7 +14,7 @@ import java.util.Optional;
*/
public class TaskKit {
static final JsonConvert convert = JsonConvert.root();
private static List<TaskEntity> taskEntities;
private static List<DbTask> taskEntities;
static {
init();
@@ -25,11 +25,11 @@ public class TaskKit {
}
public static Task buildTask(String name, String platToken, Kv para) {
TaskEntity taskEntity = getTaskEntity(name, platToken);
DbTask taskEntity = getTaskEntity(name, platToken);
return buildTask(taskEntity, para);
}
public static Task buildTask(TaskEntity taskEntity, Kv para) {
public static Task buildTask(DbTask taskEntity, Kv para) {
Task task = new Task();
task.setName(taskEntity.getName());
task.setTitle(taskEntity.getTitle());
@@ -51,11 +51,11 @@ public class TaskKit {
return task;
}
public static TaskEntity getTaskEntity(String name, String platToken) {
public static DbTask getTaskEntity(String name, String platToken) {
Objects.requireNonNull(name);
Objects.requireNonNull(platToken);
Optional<TaskEntity> any = taskEntities.stream()
Optional<DbTask> any = taskEntities.stream()
.filter(x -> name.equals(x.getName()) && MetaKit.getPlatId(platToken).equals(x.getSysPlatId()))
.findAny();
return any.get();
@@ -66,7 +66,7 @@ public class TaskKit {
return QRuner.query(task);
}
public static Object taskRun(TaskEntity entity) {
public static Object taskRun(DbTask entity) {
Task task = buildTask(entity, Kv.of());
return QRuner.query(task);
}