1、优化

Former-commit-id: 33a982a17e6b8e9c75095cce945fbbc9403f396e

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java

@@ -259,6 +259,7 @@ public class SpringBootCallable implements Callable {
         freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "FreeMarkerConfig.java"), "SpringBoot/java/config/FreeMarkerConfig.java", ctx);
         freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "SecurityConfig.java"), "SpringBoot/java/config/SecurityConfig.java", ctx);
         freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ScheduleConfig.java"), "SpringBoot/java/config/ScheduleConfig.java", ctx);
+        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "TaskSqlConfig.java"), "SpringBoot/java/config/TaskSqlConfig.java", ctx);
         if (project.isNeedAsync()) {
             freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ThreadPoolConfig.java"), "SpringBoot/java/config/ThreadPoolConfig.java", ctx);
         }

src/main/resources/modules/SpringBoot/java/config/TaskSqlConfig.java

@@ -0,0 +1,55 @@
+package ${basePackage}.config;
+
+import ${basePackage}.frame.auth.LocalData;
+import ${basePackage}.frame.schedule.RunDelayRepeatTask;
+import ${basePackage}.module.system.ent.TaskSql;
+import ${basePackage}.module.system.mgr.TaskSqlManager;
+import ${basePackage}.module.system.req.TaskSqlFindRequest;
+import ${basePackage}.module.system.rsp.TaskSqlFindResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+import java.time.Duration;
+
+/**
+ * Sql任务注册配置
+ */
+@Configuration
+public class TaskSqlConfig {
+    @Autowired
+    private ScheduleConfig scheduleConfig;
+    @Autowired
+    private TaskSqlManager taskSqlManager;
+
+
+    @PostConstruct
+    public void ss() {
+        TaskSqlFindRequest taskSqlFindRequest = new TaskSqlFindRequest();
+        taskSqlFindRequest.setValid(true);
+        taskSqlFindRequest.setPageSize(0);
+        TaskSqlFindResponse taskSqlFindResponse = taskSqlManager.find(taskSqlFindRequest, LocalData.getSysToken());
+        for (TaskSql taskSql : taskSqlFindResponse.getResult()) {
+            if ("DelayRepeat".equals(taskSql.getTaskType())) {
+                scheduleConfig.createOrRepeat(new RunDelayRepeatTask() {
+                    @Override
+                    public Duration interval() {
+                        String typeValue = taskSql.getTypeValue();
+                        return Duration.ofSeconds(Integer.parseInt(typeValue));
+                    }
+
+                    @Override
+                    public String taskId() {
+                        return String.valueOf(taskSql.getId());
+                    }
+
+                    @Override
+                    public void run() {
+
+                    }
+                });
+            }
+        }
+
+    }
+}

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -29,9 +29,7 @@
                 </template>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/system/profiles.htm'})">系统配置</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/system/res.htm'})">资源管理</el-menu-item>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: 'SQL任务', name: 'taskSql', url: '${r'${context}'}/system/taskSql.htm'})">SQL任务</el-menu-item>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '计划调度', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">计划调度</el-menu-item>
             </el-submenu>
             ${print('</#if>')}
             ${print('<#if token.hasRes("SYS")>')}
@@ -47,6 +45,14 @@
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/system/file.htm'})">文件管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/system/tokens.htm'})">登录管理</el-menu-item>
             </el-submenu>
+            <el-submenu index="${tool.uuid()}" >
+                <template slot="title">
+                    <i class="el-icon-stopwatch"></i>
+                    <span slot="title">监控运行</span>
+                </template>
+                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
+                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '计划调度', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">计划调度</el-menu-item>
+            </el-submenu>
             ${print('</#if>')}
 </#if>
 <#list modules as item>