⚡ flow模块迁移入blade-service

blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/entity/FlowModel.java

@@ -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;
-
-}

blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.java

@@ -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<FlowModel> {
-
-	/**
-	 * 自定义分页
-	 * @param page
-	 * @param flowModel
-	 * @return
-	 */
-	List<FlowModel> selectFlowPage(IPage page, FlowModel flowModel);
-}

blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/FlowService.java

@@ -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<FlowModel> {
-
-	/**
-	 * 自定义分页
-	 * @param page
-	 * @param flowModel
-	 * @return
-	 */
-	IPage<FlowModel> selectFlowPage(IPage<FlowModel> page, FlowModel flowModel);
-}

blade-ops/blade-flowable/src/main/java/org/springblade/flowable/engine/service/impl/FlowServiceImpl.java

@@ -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<FlowMapper, FlowModel> implements FlowService {
-	@Override
-	public IPage<FlowModel> selectFlowPage(IPage<FlowModel> page, FlowModel flowModel) {
-		return page.setRecords(baseMapper.selectFlowPage(page, flowModel));
-	}
-}

blade-ops/pom.xml

@@ -14,7 +14,6 @@
     <modules>
         <module>blade-admin</module>
         <module>blade-develop</module>
-        <module>blade-flowable</module>
         <module>blade-flowdesign</module>
     </modules>
 

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"]
 

blade-service/blade-flow/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-flowable</artifactId>
+    <artifactId>blade-flow</artifactId>
     <name>${project.artifactId}</name>
     <version>${bladex.project.version}</version>
     <packaging>jar</packaging>

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);
 	}
 
 }

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 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 = "modelKey", value = "模型标识", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "title", value = "公告标题", paramType = "query", dataType = "string")
+		@ApiImplicitParam(name = "name", value = "模型名称", paramType = "query", dataType = "string")
 	})
 	@ApiOperation(value = "分页", notes = "传入notice", position = 1)
 	public R<IPage<FlowModel>> list(@ApiIgnore @RequestParam Map<String, Object> flow, Query query) {
 		IPage<FlowModel> 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);
+	}
+
 }

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;
+
+}

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<FlowModel> {
+
+	/**
+	 * 自定义分页
+	 * @param page
+	 * @param flowModel
+	 * @return
+	 */
+	List<FlowModel> selectFlowPage(IPage page, FlowModel flowModel);
+}

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<FlowModel> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page      分页工具
+	 * @param flowModel 流程模型
+	 * @return
+	 */
+	IPage<FlowModel> selectFlowPage(IPage<FlowModel> page, FlowModel flowModel);
+
+	/**
+	 * 部署流程
+	 *
+	 * @param modelId  模型id
+	 * @param category 分类
+	 * @return
+	 */
+	boolean deploy(String modelId, String category);
+}

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<FlowMapper, FlowModel> implements FlowService {
+	@Override
+	public IPage<FlowModel> selectFlowPage(IPage<FlowModel> page, FlowModel flowModel) {
+		return page.setRecords(baseMapper.selectFlowPage(page, flowModel));
+	}
+
+	@Override
+	public boolean deploy(String modelId, String category) {
+		return false;
+	}
+}

blade-service/pom.xml

@@ -18,6 +18,7 @@
 
     <modules>
         <module>blade-desk</module>
+        <module>blade-flow</module>
         <module>blade-log</module>
         <module>blade-system</module>
         <module>blade-user</module>

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);