wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整路径，优化结构

Browse Source
This commit is contained in:
lvshaohua 2023-06-16 18:43:20 +08:00
parent c8a25efd28
commit f0dcf8cc9c
31 changed files with 235 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/PageParam.java → workflow-engine-server/src/main/java/cn/axzo/server/request/BpmPageParam.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.request;
package cn.axzo.server.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable;
@ApiModel("分页参数")
public class PageParam implements Serializable {
public class BpmPageParam implements Serializable {
private static final Integer PAGE_NO = 1;
private static final Integer PAGE_SIZE = 10;
@ApiModelProperty(
@ -43,7 +43,7 @@ public class PageParam implements Serializable {
)
private Integer pageSize;
public PageParam() {
public BpmPageParam() {
this.pageNo = PAGE_NO;
this.pageSize = PAGE_SIZE;
}
@ -56,12 +56,12 @@ public class PageParam implements Serializable {
return this.pageSize;
}
public PageParam setPageNo(Integer pageNo) {
public BpmPageParam setPageNo(Integer pageNo) {
this.pageNo = pageNo;
return this;
}
public PageParam setPageSize(Integer pageSize) {
public BpmPageParam setPageSize(Integer pageSize) {
this.pageSize = pageSize;
return this;
}
@ -70,10 +70,10 @@ public class PageParam implements Serializable {
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (!(o instanceof PageParam)) {
} else if (!(o instanceof BpmPageParam)) {
return false;
} else {
PageParam other = (PageParam)o;
BpmPageParam other = (BpmPageParam)o;
if (!other.canEqual(this)) {
return false;
} else {
@ -108,7 +108,7 @@ public class PageParam implements Serializable {
}
protected boolean canEqual(Object other) {
return other instanceof PageParam;
return other instanceof BpmPageParam;
}
}

6
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/model/BpmModelPageDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/model/BpmModelBpmPageDTO.java
View File

@ -1,9 +1,9 @@
package cn.axzo.server.service.dto.request.model;
package cn.axzo.server.request.model;
import cn.axzo.server.service.dto.request.PageParam;
import cn.axzo.server.request.BpmPageParam;
import io.swagger.annotations.ApiModelProperty;
public class BpmModelPageDTO extends PageParam {
public class BpmModelBpmPageDTO extends BpmPageParam {
/**
* 标识

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/model/BpmModelCreateDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/model/BpmModelCreateDTO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.request.model;
package cn.axzo.server.request.model;
import cn.axzo.server.repository.dto.BpmJsonNode;
import io.swagger.annotations.ApiModelProperty;

5
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/model/BpmModelUpdateDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/model/BpmModelUpdateDTO.java
View File

@ -1,10 +1,7 @@
package cn.axzo.server.service.dto.request.model;
package cn.axzo.server.request.model;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* 修改流程模型的 DTO

19
workflow-engine-server/src/main/java/cn/axzo/server/request/process/BpmProcessDefinitionPageDTO.java Normal file
View File

@ -0,0 +1,19 @@
package cn.axzo.server.request.process;
import cn.axzo.server.request.BpmPageParam;
import cn.axzo.server.request.model.BpmModelBpmPageDTO;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotNull;
public class BpmProcessDefinitionPageDTO extends BpmPageParam {
@ApiModelProperty(value = "流程标识，传了精准匹配")
private String key;
@ApiModelProperty(value = "租户Id", example = "1")
private Long tenantId;
@ApiModelProperty(value = "中断状态", example = "1", notes = "参见 SuspensionState 枚举")
private Integer suspensionState;
}

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/process/BpmProcessInstanceCreateDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/process/BpmProcessInstanceCreateDTO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.request.process;
package cn.axzo.server.request.process;
import lombok.Data;

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/task/BpmTaskAuditDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/task/BpmTaskAuditDTO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.request.task;
package cn.axzo.server.request.task;
import org.flowable.engine.task.Comment;

6
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/request/task/BpmTaskTodoPageDTO.java → workflow-engine-server/src/main/java/cn/axzo/server/request/task/BpmTaskTodoBpmPageDTO.java
View File

@ -1,6 +1,6 @@
package cn.axzo.server.service.dto.request.task;
package cn.axzo.server.request.task;
import cn.axzo.server.service.dto.request.PageParam;
import cn.axzo.server.request.BpmPageParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@ -8,7 +8,7 @@ import lombok.ToString;
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BpmTaskTodoPageDTO extends PageParam {
public class BpmTaskTodoBpmPageDTO extends PageParam {
/**
* 用户ID，唯一标识

36
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/BpmPageResult.java → workflow-engine-server/src/main/java/cn/axzo/server/response/BpmPageResult.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response;
package cn.axzo.server.response;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -7,6 +7,9 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* @author shao_hua
*/
@ApiModel("分页结果")
public class BpmPageResult<T> implements Serializable {
@ApiModelProperty(
@ -58,35 +61,4 @@ public class BpmPageResult<T> implements Serializable {
this.total = total;
return this;
}
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (!(o instanceof BpmPageResult)) {
return false;
} else {
BpmPageResult<?> other = (BpmPageResult)o;
Object this$total = this.getTotal();
Object other$total = other.getTotal();
if (this$total == null) {
if (other$total != null) {
return false;
}
} else if (!this$total.equals(other$total)) {
return false;
}
Object this$list = this.getList();
Object other$list = other.getList();
if (this$list == null) {
if (other$list != null) {
return false;
}
} else if (!this$list.equals(other$list)) {
return false;
}
return true;
}
}
}

5
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/model/BpmModelBaseVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/model/BpmModelBaseVO.java
View File

@ -1,12 +1,9 @@
package cn.axzo.server.service.dto.response.model;
package cn.axzo.server.response.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.Date;
import java.util.Map;

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/model/BpmModelDetailVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/model/BpmModelDetailVO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response.model;
package cn.axzo.server.response.model;
import cn.axzo.server.repository.dto.BpmJsonNode;
import lombok.Data;

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/model/BpmModelPageItemVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/model/BpmModelPageItemVO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response.model;
package cn.axzo.server.response.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

26
workflow-engine-server/src/main/java/cn/axzo/server/response/process/BpmProcessDefinitionPageItemRespVO.java Normal file
View File

@ -0,0 +1,26 @@
package cn.axzo.server.response.process;
import cn.axzo.server.response.process.BpmProcessDefinitionVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Date;
@ApiModel("管理后台 - 流程定义的分页的每一项 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BpmProcessDefinitionPageItemRespVO extends BpmProcessDefinitionVO {
@ApiModelProperty(value = "表单名字", example = "请假表单")
private String formName;
@ApiModelProperty(value = "部署时间", required = true)
private Date deploymentTime;
@ApiModelProperty(value = "是否还同步于公共模板")
private Boolean syncModelPool;
}

55
workflow-engine-server/src/main/java/cn/axzo/server/response/process/BpmProcessDefinitionVO.java Normal file
View File

@ -0,0 +1,55 @@
package cn.axzo.server.response.process;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@ApiModel("管理后台 - 流程定义 Response VO")
@Data
public class BpmProcessDefinitionVO {
@ApiModelProperty(value = "编号", required = true, example = "1024")
private String id;
@ApiModelProperty(value = "版本", required = true, example = "1")
private Integer version;
@ApiModelProperty(value = "流程名称", required = true, example = "芋道")
@NotEmpty(message = "流程名称不能为空")
private String name;
@ApiModelProperty(value = "流程描述", example = "我是描述")
private String description;
@ApiModelProperty(value = "流程分类", notes = "参见 bpm_model_category 数据字典", example = "1")
@NotEmpty(message = "流程分类不能为空")
private String category;
@ApiModelProperty(value = "表单类型", notes = "参见 bpm_model_form_type 数据字典", example = "1")
private Integer formType;
@ApiModelProperty(value = "表单编号", example = "1024", notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空")
private Long formId;
@ApiModelProperty(value = "表单的配置", required = true,
notes = "JSON 字符串。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空")
private String formConf;
@ApiModelProperty(value = "表单项的数组", required = true,
notes = "JSON 字符串的数组。在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空")
private List<String> formFields;
@ApiModelProperty(value = "自定义表单的提交路径，使用 Vue 的路由地址", example = "/bpm/oa/leave/create",
notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空")
private String formCustomCreatePath;
@ApiModelProperty(value = "自定义表单的查看路径，使用 Vue 的路由地址", example = "/bpm/oa/leave/view",
notes = "在表单类型为 {@link BpmModelFormTypeEnum#CUSTOM} 时，必须非空")
private String formCustomViewPath;
@ApiModelProperty(value = "中断状态", required = true, example = "1", notes = "参见 SuspensionState 枚举")
private Integer suspensionState;
}

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/process/BpmProcessInstanceVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/process/BpmProcessInstanceVO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response.process;
package cn.axzo.server.response.process;
import cn.axzo.server.repository.dataobject.BpmProcessInstanceExtDO;

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/task/BpmTaskDonePageItemVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/task/BpmTaskDonePageItemVO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response.task;
package cn.axzo.server.response.task;
import io.swagger.annotations.ApiModelProperty;

2
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/task/BpmTaskTodoPageItemVO.java → workflow-engine-server/src/main/java/cn/axzo/server/response/task/BpmTaskTodoPageItemVO.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.dto.response.task;
package cn.axzo.server.response.task;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

8
workflow-engine-server/src/main/java/cn/axzo/server/service/BpmCategoryService.java Normal file
View File

@ -0,0 +1,8 @@
package cn.axzo.server.service;
/**
* Category的增删改查
*/
public interface BpmCategoryService {
}

14
workflow-engine-server/src/main/java/cn/axzo/server/service/BpmModelService.java
View File

@ -1,11 +1,11 @@
package cn.axzo.server.service;
import cn.axzo.server.service.dto.request.model.BpmModelCreateDTO;
import cn.axzo.server.service.dto.request.model.BpmModelPageDTO;
import cn.axzo.server.service.dto.request.model.BpmModelUpdateDTO;
import cn.axzo.server.service.dto.response.BpmPageResult;
import cn.axzo.server.service.dto.response.model.BpmModelDetailVO;
import cn.axzo.server.service.dto.response.model.BpmModelPageItemVO;
import cn.axzo.server.request.model.BpmModelCreateDTO;
import cn.axzo.server.request.model.BpmModelBpmPageDTO;
import cn.axzo.server.request.model.BpmModelUpdateDTO;
import cn.axzo.server.response.BpmPageResult;
import cn.axzo.server.response.model.BpmModelDetailVO;
import cn.axzo.server.response.model.BpmModelPageItemVO;
import io.swagger.annotations.ApiOperation;
@ApiOperation("流程模型 - 部署流程")
@ -14,7 +14,7 @@ public interface BpmModelService {
/**
* 获取流程模型的查询结果
* */
BpmPageResult<BpmModelPageItemVO> getModelPage(BpmModelPageDTO modelPageDTO);
BpmPageResult<BpmModelPageItemVO> getModelPage(BpmModelBpmPageDTO modelPageDTO);
/**
* 创建流程,

28
workflow-engine-server/src/main/java/cn/axzo/server/service/BpmProcessDefinitionService.java
View File

@ -1,10 +1,13 @@
package cn.axzo.server.service;
import cn.axzo.server.service.dto.response.process.BpmProcessInstanceVO;
import cn.axzo.server.request.process.BpmProcessDefinitionPageDTO;
import cn.axzo.server.response.process.BpmProcessDefinitionPageItemRespVO;
import cn.axzo.server.response.BpmPageResult;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import java.util.List;
public interface BpmProcessDefinitionService {
/**
* 挂起/激活流程，
@ -14,25 +17,14 @@ public interface BpmProcessDefinitionService {
* */
void updateProcessDefinitionSuspendedState(String processDefinitionId, Integer state);
/**
* 获取活跃的流程定义
* */
ProcessDefinition getActiveProcessDefinitionByKey(String key);
BpmPageResult<BpmProcessDefinitionPageItemRespVO> getProcessDefinitionPage(BpmProcessDefinitionPageDTO);
/**
* 获得历史的流程实例
* 获得编号对应的 ProcessDefinition
*
* @param id 流程实例的编号
* @return 历史的流程实例
* @param id 编号
* @return 流程定义
*/
HistoricProcessInstance getHistoricProcessInstance(String id, String tenantId);
/**
* 获得流程实例 VO 信息
*
* @param id 流程实例的编号
* @return 流程实例
*/
BpmProcessInstanceVO getProcessInstanceVO(String id, String tenantId);
ProcessDefinition getProcessDefinition(String id);
}

28
workflow-engine-server/src/main/java/cn/axzo/server/service/BpmProcessInstanceService.java
View File

@ -1,6 +1,9 @@
package cn.axzo.server.service;
import cn.axzo.server.service.dto.request.process.BpmProcessInstanceCreateDTO;
import cn.axzo.server.request.process.BpmProcessInstanceCreateDTO;
import cn.axzo.server.response.process.BpmProcessInstanceVO;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
public interface BpmProcessInstanceService {
@ -15,5 +18,26 @@ public interface BpmProcessInstanceService {
Boolean updateProcessStatus(String processInstanceId, String status);
public String createProcessInstance(BpmProcessInstanceCreateDTO processInstanceCreateDTO);
String createProcessInstance(BpmProcessInstanceCreateDTO processInstanceCreateDTO);
/**
* 获取活跃的流程定义
* */
ProcessDefinition getActiveProcessDefinitionByKey(String key);
/**
* 获得历史的流程实例
*
* @param id 流程实例的编号
* @return 历史的流程实例
*/
HistoricProcessInstance getHistoricProcessInstance(String id, String tenantId);
/**
* 获得流程实例 VO 信息
*
* @param id 流程实例的编号
* @return 流程实例
*/
BpmProcessInstanceVO getProcessInstanceVO(String id, String tenantId);
}

16
workflow-engine-server/src/main/java/cn/axzo/server/service/BpmTaskService.java
View File

@ -1,10 +1,10 @@
package cn.axzo.server.service;
import cn.axzo.server.service.dto.request.task.BpmTaskAuditDTO;
import cn.axzo.server.service.dto.request.task.BpmTaskTodoPageDTO;
import cn.axzo.server.service.dto.response.BpmPageResult;
import cn.axzo.server.service.dto.response.task.BpmTaskDonePageItemVO;
import cn.axzo.server.service.dto.response.task.BpmTaskTodoPageItemVO;
import cn.axzo.server.request.task.BpmTaskAuditDTO;
import cn.axzo.server.request.task.BpmTaskTodoBpmPageDTO;
import cn.axzo.server.response.BpmPageResult;
import cn.axzo.server.response.task.BpmTaskDonePageItemVO;
import cn.axzo.server.response.task.BpmTaskTodoPageItemVO;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
@ -15,17 +15,17 @@ public interface BpmTaskService {
/**
* 待审核列表
* */
BpmPageResult<BpmTaskTodoPageItemVO> getTodoTaskPage(BpmTaskTodoPageDTO taskTodoPageDTO);
BpmPageResult<BpmTaskTodoPageItemVO> getTodoTaskPage(BpmTaskTodoBpmPageDTO taskTodoPageDTO);
/**
* 已完成的审批列表
* */
BpmPageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoPageDTO taskDonePageD);
BpmPageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoBpmPageDTO taskDonePageD);
/**
* 我发起的审批列表
* */
BpmPageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoPageDTO taskDonePageD);
BpmPageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoBpmPageDTO taskDonePageD);
/**
* 同意

2
workflow-engine-server/src/main/java/cn/axzo/server/service/converter/BpmModelConverter.java
View File

@ -1,6 +1,6 @@
package cn.axzo.server.service.converter;
import cn.axzo.server.service.dto.response.model.BpmModelDetailVO;
import cn.axzo.server.response.model.BpmModelDetailVO;
import org.flowable.engine.repository.Model;
import org.springframework.util.ObjectUtils;

4
workflow-engine-server/src/main/java/cn/axzo/server/service/dto/response/process/BpmProcessDefinitionVO.java
View File

@ -1,4 +0,0 @@
package cn.axzo.server.service.dto.response.process;
public class BpmProcessDefinitionVO {
}

8
workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmCategoryServiceImpl.java Normal file
View File

@ -0,0 +1,8 @@
package cn.axzo.server.service.impl;
import cn.axzo.server.service.BpmCategoryService;
import org.springframework.stereotype.Service;
@Service
public class BpmCategoryServiceImpl implements BpmCategoryService {
}

14
workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmModelServiceImpl.java
View File

@ -4,12 +4,12 @@ import cn.axzo.framework.domain.ServiceException;
import cn.axzo.server.common.enums.BpmErrorCode;
import cn.axzo.server.service.BpmModelService;
import cn.axzo.server.service.converter.BpmModelConverter;
import cn.axzo.server.service.dto.request.model.BpmModelCreateDTO;
import cn.axzo.server.service.dto.request.model.BpmModelPageDTO;
import cn.axzo.server.service.dto.request.model.BpmModelUpdateDTO;
import cn.axzo.server.service.dto.response.BpmPageResult;
import cn.axzo.server.service.dto.response.model.BpmModelDetailVO;
import cn.axzo.server.service.dto.response.model.BpmModelPageItemVO;
import cn.axzo.server.request.model.BpmModelCreateDTO;
import cn.axzo.server.request.model.BpmModelBpmPageDTO;
import cn.axzo.server.request.model.BpmModelUpdateDTO;
import cn.axzo.server.response.BpmPageResult;
import cn.axzo.server.response.model.BpmModelDetailVO;
import cn.axzo.server.response.model.BpmModelPageItemVO;
import com.alibaba.fastjson.JSON;
import org.apache.commons.lang3.ObjectUtils;
import org.flowable.engine.RepositoryService;
@ -32,7 +32,7 @@ public class BpmModelServiceImpl implements BpmModelService {
private BpmProcessDefinitionServiceImpl processDefinitionServiceImpl;
@Override
public BpmPageResult<BpmModelPageItemVO> getModelPage(BpmModelPageDTO modelPageDTO) {
public BpmPageResult<BpmModelPageItemVO> getModelPage(BpmModelBpmPageDTO modelPageDTO) {
return null;
}

15
workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmProcessDefinitionServiceImpl.java
View File

@ -1,8 +1,10 @@
package cn.axzo.server.service.impl;
import cn.axzo.framework.domain.ServiceException;
import cn.axzo.server.response.BpmPageResult;
import cn.axzo.server.response.process.BpmProcessDefinitionPageItemRespVO;
import cn.axzo.server.service.BpmProcessDefinitionService;
import cn.axzo.server.service.dto.response.process.BpmProcessInstanceVO;
import cn.axzo.server.response.process.BpmProcessInstanceVO;
import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.RepositoryService;
@ -76,19 +78,12 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
}
@Override
public ProcessDefinition getActiveProcessDefinitionByKey(String key) {
return repositoryService.createProcessDefinitionQuery().processDefinitionKey(key).active()
.singleResult();
}
@Override
public HistoricProcessInstance getHistoricProcessInstance(String id, String tenantId) {
public BpmPageResult<BpmProcessDefinitionPageItemRespVO> getProcessDefinitionPage() {
return null;
}
@Override
public BpmProcessInstanceVO getProcessInstanceVO(String id, String tenantId) {
public ProcessDefinition getProcessDefinition(String id) {
return null;
}
}

20
workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmProcessInstanceServiceImpl.java
View File

@ -1,12 +1,14 @@
package cn.axzo.server.service.impl;
import cn.axzo.server.repository.mapper.BpmProcessInstanceExtMapper;
import cn.axzo.server.response.process.BpmProcessInstanceVO;
import cn.axzo.server.service.BpmProcessDefinitionService;
import cn.axzo.server.service.BpmProcessInstanceService;
import cn.axzo.server.service.BpmTaskService;
import cn.axzo.server.service.dto.request.process.BpmProcessInstanceCreateDTO;
import cn.axzo.server.request.process.BpmProcessInstanceCreateDTO;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.flowable.engine.*;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.engine.runtime.ProcessInstanceQuery;
@ -14,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Set;
@ -78,4 +79,19 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
public String createProcessInstance(BpmProcessInstanceCreateDTO processInstanceCreateDTO) {
return null;
}
@Override
public ProcessDefinition getActiveProcessDefinitionByKey(String key) {
return null;
}
@Override
public HistoricProcessInstance getHistoricProcessInstance(String id, String tenantId) {
return null;
}
@Override
public BpmProcessInstanceVO getProcessInstanceVO(String id, String tenantId) {
return null;
}
}

16
workflow-engine-server/src/main/java/cn/axzo/server/service/impl/BpmTaskServiceImpl.java
View File

@ -1,11 +1,11 @@
package cn.axzo.server.service.impl;
import cn.axzo.server.request.task.BpmTaskAuditDTO;
import cn.axzo.server.request.task.BpmTaskTodoBpmPageDTO;
import cn.axzo.server.response.BpmPageResult;
import cn.axzo.server.response.task.BpmTaskDonePageItemVO;
import cn.axzo.server.response.task.BpmTaskTodoPageItemVO;
import cn.axzo.server.service.BpmTaskService;
import cn.axzo.server.service.dto.request.task.BpmTaskAuditDTO;
import cn.axzo.server.service.dto.request.task.BpmTaskTodoPageDTO;
import cn.axzo.server.service.dto.response.BpmPageResult;
import cn.axzo.server.service.dto.response.task.BpmTaskDonePageItemVO;
import cn.axzo.server.service.dto.response.task.BpmTaskTodoPageItemVO;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.stereotype.Service;
@ -18,17 +18,17 @@ public class BpmTaskServiceImpl implements BpmTaskService {
@Override
public BpmPageResult<BpmTaskTodoPageItemVO> getTodoTaskPage(BpmTaskTodoPageDTO taskTodoPageDTO) {
public BpmPageResult<BpmTaskTodoPageItemVO> getTodoTaskPage(BpmTaskTodoBpmPageDTO taskTodoPageDTO) {
return null;
}
@Override
public BpmPageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoPageDTO taskDonePageD) {
public BpmPageResult<BpmTaskDonePageItemVO> getDoneTaskPage(BpmTaskTodoBpmPageDTO taskDonePageD) {
return null;
}
@Override
public BpmPageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoPageDTO taskDonePageD) {
public BpmPageResult<BpmTaskDonePageItemVO> getOwnTaskPage(BpmTaskTodoBpmPageDTO taskDonePageD) {
return null;
}

2
workflow-engine-server/src/main/java/cn/axzo/server/service/utils/BpmTransformUtil.java → workflow-engine-server/src/main/java/cn/axzo/server/utils/BpmTransformUtil.java
View File

@ -1,4 +1,4 @@
package cn.axzo.server.service.utils;
package cn.axzo.server.utils;
import cn.axzo.framework.domain.ServiceException;
import cn.axzo.server.common.WorkflowConstants;

6
workflow-engine-server/src/main/resources/META-INF/spring.factories
View File

@ -1,6 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
cn.axzo.server.service.BpmProcessDefinitionService,\
cn.axzo.server.service.impl.BpmProcessDefinitionServiceImpl,\
cn.axzo.server.service.BpmModelService,\
cn.axzo.server.service.BpmProcessInstanceService,\
cn.axzo.server.service.BpmTaskService,