lxy/meta-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改：1、qtask.call 服务

Browse Source 
2、其他界面样式优化
This commit is contained in:
绝尘
2024-04-01 01:06:06 +08:00
parent 4dcebf32de
commit 7bbbd29931
18 changed files with 170 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/net/tccn/qtask/TaskKit.java
View File

@@ -3,10 +3,8 @@ package net.tccn.qtask;
import dev.zhub.mk.qtask.QTask;
import net.tccn.base.Kv;
import net.tccn.base.MetaKit;
import org.redkale.convert.json.JsonConvert;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -14,61 +12,40 @@ import java.util.Optional;
* Created by liangxianyou at 2019/4/20 19:59.
*/
public class TaskKit {
static final JsonConvert convert = JsonConvert.root();
private static List<QTask> taskEntities;
private static List<QTask> qTasks;
static {
init();
public static void init(List<QTask> tasks) {
qTasks = tasks;
}
public static void init() {
taskEntities = MetaKit.getTaskEntities();
}
public static Task buildTask(String name, String platToken, Kv para) {
QTask taskEntity = getTaskEntity(name, platToken);
public static Task buildTask(String name, String plattoken, Kv para) {
QTask taskEntity = getTaskEntity(name, plattoken);
return buildTask(taskEntity, para);
}
public static Task buildTask(dev.zhub.mk.qtask.QTask taskEntity, Kv para) {
Task task = new Task();
task.setName(taskEntity.getName());
task.setTitle(taskEntity.getTitle());
task.setContent(taskEntity.getContent());
task.setDbPlatId(taskEntity.getDbplatid());
task.setCatalog(taskEntity.getCatalog());
Kv _para = Kv.of().putAll(para);
if (taskEntity.getPara() != null) {
try {
Map<String, String> map = convert.convertFrom(JsonConvert.TYPE_MAP_STRING_STRING, taskEntity.getPara());
map.forEach((k,v) -> _para.put(k, v));
} catch (Exception e) {
new IllegalArgumentException(String.format("fromJson error:[%s]",taskEntity.getPara()), e);
}
}
task.setPara(_para);
task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbplatid()));
public static Task buildTask(dev.zhub.mk.qtask.QTask qTask, Kv para) {
Task task = qTask.createTask(para);
task.setDbAccount(MetaKit.getDbPlat(qTask.getDbplatid()));
return task;
}
public static QTask getTaskEntity(String name, String platToken) {
public static QTask getTaskEntity(String name, String platid) {
Objects.requireNonNull(name);
Objects.requireNonNull(platToken);
Objects.requireNonNull(platid);
Optional<QTask> any = taskEntities.stream()
.filter(x -> name.equals(x.getName()) && MetaKit.getPlatId(platToken).equals(x.getPlatid()))
Optional<QTask> any = qTasks.stream()
.filter(x -> name.equals(x.getName()) && MetaKit.getPlatId(platid).equals(x.getPlatid()))
.findAny();
return any.get();
}
public static Object taskRun(String name, String platToken, Kv para) {
Task task = buildTask(name, platToken, para);
public static Object taskRun(String name, String plattoken, Kv para) {
Task task = buildTask(name, plattoken, para);
return QRuner.query(task);
}
public static Object taskRun(QTask entity) {
Task task = buildTask(entity, Kv.of());
public static Object taskRun(QTask qTask) {
Task task = buildTask(qTask, Kv.of());
return QRuner.query(task);
}
}