diff --git a/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/TaskTemplate.java b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/TaskTemplate.java index 5996421..1c60fa5 100644 --- a/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/TaskTemplate.java +++ b/leopard-core/src/main/java/com/lanyuanxiaoyao/leopard/core/entity/TaskTemplate.java @@ -29,5 +29,9 @@ public class TaskTemplate extends SimpleEntity { @Column(nullable = false, length = 500) private String description; @Column(nullable = false) + private String application; + @Column(nullable = false) private String chain; + @Column(nullable = false) + private String expression; } \ No newline at end of file diff --git a/leopard-server/pom.xml b/leopard-server/pom.xml index a520dce..e71c755 100644 --- a/leopard-server/pom.xml +++ b/leopard-server/pom.xml @@ -45,6 +45,10 @@ com.yomahub liteflow-spring-boot-starter + + com.yomahub + liteflow-rule-sql + cn.hutool diff --git a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskTemplateController.java b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskTemplateController.java index 25af3ad..2503348 100644 --- a/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskTemplateController.java +++ b/leopard-server/src/main/java/com/lanyuanxiaoyao/leopard/server/controller/TaskTemplateController.java @@ -1,10 +1,12 @@ package com.lanyuanxiaoyao.leopard.server.controller; +import cn.hutool.core.util.IdUtil; import com.lanyuanxiaoyao.leopard.core.entity.TaskTemplate; import com.lanyuanxiaoyao.leopard.server.service.TaskTemplateService; import com.lanyuanxiaoyao.service.template.controller.SimpleControllerSupport; import java.util.function.Function; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +14,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("task_template") public class TaskTemplateController extends SimpleControllerSupport { + @Value("${spring.application.name}") + private String application; + public TaskTemplateController(TaskTemplateService service) { super(service); } @@ -23,7 +28,9 @@ public class TaskTemplateController extends SimpleControllerSupport { public TaskTemplateService(TaskTemplateRepository repository) { super(repository); } + + @Override + public Long save(TaskTemplate entity) { + Long id = super.save(entity); + LiteflowMetaOperator.reloadAllChain(); + return id; + } + + @Override + public void save(Iterable taskTemplates) { + super.save(taskTemplates); + LiteflowMetaOperator.reloadAllChain(); + } + + @Override + public void remove(Iterable ids) { + super.remove(ids); + LiteflowMetaOperator.reloadAllChain(); + } + + @Override + public void remove(Long id) { + super.remove(id); + LiteflowMetaOperator.reloadAllChain(); + } } diff --git a/leopard-server/src/main/resources/application.yml b/leopard-server/src/main/resources/application.yml index a5e00e0..42e0b73 100644 --- a/leopard-server/src/main/resources/application.yml +++ b/leopard-server/src/main/resources/application.yml @@ -37,5 +37,11 @@ fenix: print-banner: false liteflow: print-banner: false - rule-source: flow.xml - check-node-exists: false \ No newline at end of file + check-node-exists: false + rule-source-ext-data-map: + applicationName: ${spring.application.name} + sqlLogEnabled: true + chainTableName: leopard_task_template + chainApplicationNameField: application + chainNameField: chain + elDataField: expression diff --git a/leopard-web/src/pages/task/TaskTemplateSave.tsx b/leopard-web/src/pages/task/TaskTemplateSave.tsx index 854e8ef..ae7ff80 100644 --- a/leopard-web/src/pages/task/TaskTemplateSave.tsx +++ b/leopard-web/src/pages/task/TaskTemplateSave.tsx @@ -55,8 +55,8 @@ function TaskTemplateSave() { }, { type: 'input-text', - name: 'chain', - label: '流程编号', + name: 'expression', + label: 'EL表达式', required: true, clearable: true, }, diff --git a/pom.xml b/pom.xml index bf4b16f..b927abe 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,11 @@ liteflow-spring-boot-starter ${liteflow.version} + + com.yomahub + liteflow-rule-sql + ${liteflow.version} + org.springframework.boot