diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java b/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java deleted file mode 100644 index a2ce6ea6..00000000 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.springblade.flowable.engine.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 流程模型 - * - * @author Chill - */ -@Data -@TableName("ACT_DE_MODEL") -public class FlowModel implements Serializable { - - private static final long serialVersionUID = 1L; - - private String id; - private String name; - private String modelKey; - private String description; - private Date created; - private Date lastUpdated; - private String createdBy; - private String lastUpdatedBy; - private Integer version; - private String modelEditorJson; - private String modelComment; - private Integer modelType; - private String tenantId; - private byte[] thumbnail; - -} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java b/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java deleted file mode 100644 index e3631bfb..00000000 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.springblade.flowable.engine.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.flowable.engine.entity.FlowModel; - -import java.util.List; - -/** - * FlowMapper. - * - * @author Chill - */ -public interface FlowMapper extends BaseMapper { - - /** - * 自定义分页 - * @param page - * @param flowModel - * @return - */ - List selectFlowPage(IPage page, FlowModel flowModel); -} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/FlowService.java b/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/FlowService.java deleted file mode 100644 index b2e36b4f..00000000 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/FlowService.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.springblade.flowable.engine.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import org.springblade.flowable.engine.entity.FlowModel; - -/** - * FlowService - * - * @author Chill - */ -public interface FlowService extends IService { - - /** - * 自定义分页 - * @param page - * @param flowModel - * @return - */ - IPage selectFlowPage(IPage page, FlowModel flowModel); -} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java b/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java deleted file mode 100644 index a7ac00bf..00000000 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.springblade.flowable.engine.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springblade.flowable.engine.entity.FlowModel; -import org.springblade.flowable.engine.mapper.FlowMapper; -import org.springblade.flowable.engine.service.FlowService; -import org.springframework.stereotype.Service; - -/** - * FlowServiceImpl - * - * @author Chill - */ -@Service -public class FlowServiceImpl extends ServiceImpl implements FlowService { - @Override - public IPage selectFlowPage(IPage page, FlowModel flowModel) { - return page.setRecords(baseMapper.selectFlowPage(page, flowModel)); - } -} diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index 7d8fae8b..760c76e4 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -14,7 +14,6 @@ blade-admin blade-develop - blade-flowable blade-flowdesign diff --git a/blade-ops/blade-flowable/Dockerfile b/blade-service/blade-flow/Dockerfile similarity index 86% rename from blade-ops/blade-flowable/Dockerfile rename to blade-service/blade-flow/Dockerfile index 8ac110db..22b16990 100644 --- a/blade-ops/blade-flowable/Dockerfile +++ b/blade-service/blade-flow/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /blade/admin EXPOSE 7002 -ADD ./target/blade-flowable.jar ./app.jar +ADD ./target/blade-flow.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/blade-ops/blade-flowable/pom.xml b/blade-service/blade-flow/pom.xml similarity index 97% rename from blade-ops/blade-flowable/pom.xml rename to blade-service/blade-flow/pom.xml index 466736b2..d451e71e 100644 --- a/blade-ops/blade-flowable/pom.xml +++ b/blade-service/blade-flow/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - blade-flowable + blade-flow ${project.artifactId} ${bladex.project.version} jar diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/FlowableApplication.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/FlowApplication.java similarity index 95% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/FlowableApplication.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/FlowApplication.java index 7101bbc9..f1d474eb 100644 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/FlowableApplication.java +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/FlowApplication.java @@ -28,10 +28,10 @@ import org.springframework.cloud.client.SpringCloudApplication; */ @EnableBladeFeign @SpringCloudApplication -public class FlowableApplication { +public class FlowApplication { public static void main(String[] args) { - BladeApplication.run(AppConstant.APPLICATION_FLOWABLE_NAME, FlowableApplication.class, args); + BladeApplication.run(AppConstant.APPLICATION_FLOWABLE_NAME, FlowApplication.class, args); } } diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/controller/ExpenseController.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/business/controller/ExpenseController.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/controller/ExpenseController.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/business/controller/ExpenseController.java diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/handler/BossTaskHandler.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/business/handler/BossTaskHandler.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/handler/BossTaskHandler.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/business/handler/BossTaskHandler.java diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/handler/ManagerTaskHandler.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/business/handler/ManagerTaskHandler.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/business/handler/ManagerTaskHandler.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/business/handler/ManagerTaskHandler.java diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/config/FlowableConfiguration.java diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowManagerController.java diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java similarity index 67% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java index d71f503f..51bc9274 100644 --- a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/controller/FlowModelController.java @@ -20,16 +20,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springblade.flowable.engine.entity.FlowModel; import org.springblade.flowable.engine.service.FlowService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.Map; @@ -51,12 +50,33 @@ public class FlowModelController { */ @GetMapping("/list") @ApiImplicitParams({ - @ApiImplicitParam(name = "category", value = "公告类型", paramType = "query", dataType = "integer"), - @ApiImplicitParam(name = "title", value = "公告标题", paramType = "query", dataType = "string") + @ApiImplicitParam(name = "modelKey", value = "模型标识", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "name", value = "模型名称", paramType = "query", dataType = "string") }) @ApiOperation(value = "分页", notes = "传入notice", position = 1) public R> list(@ApiIgnore @RequestParam Map flow, Query query) { IPage pages = flowService.page(Condition.getPage(query), Condition.getQueryWrapper(flow, FlowModel.class)); return R.data(pages); } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperation(value = "删除", notes = "传入主键集合", position = 7) + public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { + boolean temp = flowService.removeByIds(Func.toStrList(ids)); + return R.status(temp); + } + + /** + * 部署 + */ + @PostMapping("/deploy") + @ApiOperation(value = "部署", notes = "传入模型id和分类", position = 7) + public R deploy(@ApiParam(value = "模型id") @RequestParam String modelId, @ApiParam(value = "分类") @RequestParam String category) { + boolean temp = flowService.deploy(modelId, category); + return R.status(temp); + } + } diff --git a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java new file mode 100644 index 00000000..167d4973 --- /dev/null +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 流程模型 + * + * @author Chill + */ +@Data +@TableName("ACT_DE_MODEL") +public class FlowModel implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + private String name; + private String modelKey; + private String description; + private Date created; + private Date lastUpdated; + private String createdBy; + private String lastUpdatedBy; + private Integer version; + private String modelEditorJson; + private String modelComment; + private Integer modelType; + private String tenantId; + private byte[] thumbnail; + +} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/ProcessDefinition.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/entity/ProcessDefinition.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/ProcessDefinition.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/entity/ProcessDefinition.java diff --git a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java new file mode 100644 index 00000000..39e8e337 --- /dev/null +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.flowable.engine.entity.FlowModel; + +import java.util.List; + +/** + * FlowMapper. + * + * @author Chill + */ +public interface FlowMapper extends BaseMapper { + + /** + * 自定义分页 + * @param page + * @param flowModel + * @return + */ + List selectFlowPage(IPage page, FlowModel flowModel); +} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml diff --git a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java new file mode 100644 index 00000000..c750608a --- /dev/null +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/FlowService.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import org.springblade.flowable.engine.entity.FlowModel; + +/** + * FlowService + * + * @author Chill + */ +public interface FlowService extends IService { + + /** + * 自定义分页 + * + * @param page 分页工具 + * @param flowModel 流程模型 + * @return + */ + IPage selectFlowPage(IPage page, FlowModel flowModel); + + /** + * 部署流程 + * + * @param modelId 模型id + * @param category 分类 + * @return + */ + boolean deploy(String modelId, String category); +} diff --git a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java new file mode 100644 index 00000000..aadd168a --- /dev/null +++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package org.springblade.flowable.engine.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springblade.flowable.engine.entity.FlowModel; +import org.springblade.flowable.engine.mapper.FlowMapper; +import org.springblade.flowable.engine.service.FlowService; +import org.springframework.stereotype.Service; + +/** + * FlowServiceImpl + * + * @author Chill + */ +@Service +public class FlowServiceImpl extends ServiceImpl implements FlowService { + @Override + public IPage selectFlowPage(IPage page, FlowModel flowModel) { + return page.setRecords(baseMapper.selectFlowPage(page, flowModel)); + } + + @Override + public boolean deploy(String modelId, String category) { + return false; + } +} diff --git a/blade-ops/blade-flowable/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java b/blade-service/blade-flow/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java similarity index 100% rename from blade-ops/blade-flowable/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java rename to blade-service/blade-flow/src/main/java/org/springblade/flowable/launch/FlowableLauncherServiceImpl.java diff --git a/blade-ops/blade-flowable/src/main/resources/application-dev.yml b/blade-service/blade-flow/src/main/resources/application-dev.yml similarity index 100% rename from blade-ops/blade-flowable/src/main/resources/application-dev.yml rename to blade-service/blade-flow/src/main/resources/application-dev.yml diff --git a/blade-ops/blade-flowable/src/main/resources/application-prod.yml b/blade-service/blade-flow/src/main/resources/application-prod.yml similarity index 100% rename from blade-ops/blade-flowable/src/main/resources/application-prod.yml rename to blade-service/blade-flow/src/main/resources/application-prod.yml diff --git a/blade-ops/blade-flowable/src/main/resources/application-test.yml b/blade-service/blade-flow/src/main/resources/application-test.yml similarity index 100% rename from blade-ops/blade-flowable/src/main/resources/application-test.yml rename to blade-service/blade-flow/src/main/resources/application-test.yml diff --git a/blade-ops/blade-flowable/src/main/resources/application.yml b/blade-service/blade-flow/src/main/resources/application.yml similarity index 100% rename from blade-ops/blade-flowable/src/main/resources/application.yml rename to blade-service/blade-flow/src/main/resources/application.yml diff --git a/blade-ops/blade-flowable/src/main/resources/processes/ExpenseProcess.bpmn20.xml b/blade-service/blade-flow/src/main/resources/processes/ExpenseProcess.bpmn20.xml similarity index 100% rename from blade-ops/blade-flowable/src/main/resources/processes/ExpenseProcess.bpmn20.xml rename to blade-service/blade-flow/src/main/resources/processes/ExpenseProcess.bpmn20.xml diff --git a/blade-service/pom.xml b/blade-service/pom.xml index 10415f96..bf3aea5d 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -18,6 +18,7 @@ blade-desk + blade-flow blade-log blade-system blade-user diff --git a/doc/sql/bladex-update-RC9.sql b/doc/sql/bladex-update-RC9.sql index 619b6b70..0d550d51 100644 --- a/doc/sql/bladex-update-RC9.sql +++ b/doc/sql/bladex-update-RC9.sql @@ -11,11 +11,11 @@ set @modelid = (SELECT LAST_INSERT_ID()); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (@modelid, 'flow_model_create', '新增', 'create', 'http://localhost:9999/index.html', 'plus', 1, 2, 1, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@modelid, 'flow_model_update', '修改', 'update', 'http://localhost:9999/index.html#/editor/', 'form', 2, 2, 2, 1, NULL, 0); +VALUES (@modelid, 'flow_model_update', '修改', 'update', 'http://localhost:9999/index.html#/editor', 'form', 2, 2, 2, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (@modelid, 'flow_model_deploy', '部署', 'deploy', '', 'cloud-upload', 3, 2, 2, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) -VALUES (@modelid, 'flow_model_download', '下载', 'download', '', 'download', 4, 2, 2, 1, NULL, 0); +VALUES (@modelid, 'flow_model_download', '下载', 'download', 'http://localhost:9999/app/rest/models', 'download', 4, 2, 2, 1, NULL, 0); INSERT INTO `blade_menu`(`parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`) VALUES (@modelid, 'flow_model_delete', '删除', 'delete', '/api/blade-flowable/model/remove', 'delete', 5, 2, 3, 1, NULL, 0);