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

升级：1、增加界面夜间模式

Browse Source 
2、qtask 功能交互升级
     3、mysql连接管理增加心跳保活
     4、其他修改
This commit is contained in:
绝尘
2024-03-31 00:34:26 +08:00
parent 8cc55c2c4b
commit 4dcebf32de
37 changed files with 1136 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
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;
@@ -14,7 +15,7 @@ import java.util.Optional;
*/
public class TaskKit {
static final JsonConvert convert = JsonConvert.root();
private static List<DbTask> taskEntities;
private static List<QTask> taskEntities;
static {
init();
@@ -25,16 +26,16 @@ public class TaskKit {
}
public static Task buildTask(String name, String platToken, Kv para) {
DbTask taskEntity = getTaskEntity(name, platToken);
QTask taskEntity = getTaskEntity(name, platToken);
return buildTask(taskEntity, para);
}
public static Task buildTask(DbTask taskEntity, Kv 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.setDbPlatId(taskEntity.getDbplatid());
task.setCatalog(taskEntity.getCatalog());
Kv _para = Kv.of().putAll(para);
@@ -47,16 +48,16 @@ public class TaskKit {
}
}
task.setPara(_para);
task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbPlatId()));
task.setDbAccount(MetaKit.getDbPlat(taskEntity.getDbplatid()));
return task;
}
public static DbTask getTaskEntity(String name, String platToken) {
public static QTask getTaskEntity(String name, String platToken) {
Objects.requireNonNull(name);
Objects.requireNonNull(platToken);
Optional<DbTask> any = taskEntities.stream()
.filter(x -> name.equals(x.getName()) && MetaKit.getPlatId(platToken).equals(x.getSysPlatId()))
Optional<QTask> any = taskEntities.stream()
.filter(x -> name.equals(x.getName()) && MetaKit.getPlatId(platToken).equals(x.getPlatid()))
.findAny();
return any.get();
}
@@ -66,7 +67,7 @@ public class TaskKit {
return QRuner.query(task);
}
public static Object taskRun(DbTask entity) {
public static Object taskRun(QTask entity) {
Task task = buildTask(entity, Kv.of());
return QRuner.query(task);
}