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

update - 将 bpm_dict_data 表拉通测试.

Browse Source
This commit is contained in:
wangli 2023-07-08 19:26:02 +08:00
parent 7932e6bf1b
commit d3cf7792dc
23 changed files with 171 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
workflow-engine-core/src/main/java/cn/axzo/workflow/core/constants/BpmnConstants.java Normal file
View File

@ -0,0 +1,12 @@
package cn.axzo.workflow.core.constants;
/**
* bpmn common constants
*
* @author wangli
* @date 2023/7/8 18:03
*/
public interface BpmnConstants {
String BPM_MODEL_CATEGORY = "bpm_model_category";
}

155
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmBaseDO.java
View File

@ -1,155 +0,0 @@
package cn.axzo.workflow.core.repository.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
public class BpmBaseDO implements Serializable {
@TableField(
fill = FieldFill.INSERT
)
private Date createTime;
@TableField(
fill = FieldFill.INSERT_UPDATE
)
private Date updateTime;
@TableField(
fill = FieldFill.INSERT
)
private String creator;
@TableField(
fill = FieldFill.INSERT_UPDATE
)
private String updater;
@TableLogic
private Boolean deleted;
public BpmBaseDO() {
}
public Date getCreateTime() {
return this.createTime;
}
public Date getUpdateTime() {
return this.updateTime;
}
public String getCreator() {
return this.creator;
}
public String getUpdater() {
return this.updater;
}
public Boolean getDeleted() {
return this.deleted;
}
public BpmBaseDO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public BpmBaseDO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public BpmBaseDO setCreator(String creator) {
this.creator = creator;
return this;
}
public BpmBaseDO setUpdater(String updater) {
this.updater = updater;
return this;
}
public BpmBaseDO setDeleted(Boolean deleted) {
this.deleted = deleted;
return this;
}
@Override
public boolean equals(Object o) {
if (o == this) {
return true;
} else if (!(o instanceof BpmBaseDO)) {
return false;
} else {
BpmBaseDO other = (BpmBaseDO)o;
if (!other.canEqual(this)) {
return false;
} else {
label71: {
Object this$deleted = this.getDeleted();
Object other$deleted = other.getDeleted();
if (this$deleted == null) {
if (other$deleted == null) {
break label71;
}
} else if (this$deleted.equals(other$deleted)) {
break label71;
}
return false;
}
Object this$createTime = this.getCreateTime();
Object other$createTime = other.getCreateTime();
if (this$createTime == null) {
if (other$createTime != null) {
return false;
}
} else if (!this$createTime.equals(other$createTime)) {
return false;
}
label57: {
Object this$updateTime = this.getUpdateTime();
Object other$updateTime = other.getUpdateTime();
if (this$updateTime == null) {
if (other$updateTime == null) {
break label57;
}
} else if (this$updateTime.equals(other$updateTime)) {
break label57;
}
return false;
}
Object this$creator = this.getCreator();
Object other$creator = other.getCreator();
if (this$creator == null) {
if (other$creator != null) {
return false;
}
} else if (!this$creator.equals(other$creator)) {
return false;
}
Object this$updater = this.getUpdater();
Object other$updater = other.getUpdater();
if (this$updater == null) {
if (other$updater == null) {
return true;
}
} else if (this$updater.equals(other$updater)) {
return true;
}
return false;
}
}
}
protected boolean canEqual(Object other) {
return other instanceof BpmBaseDO;
}
}

37
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmDictDataDO.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.core.repository.entity;
import cn.axzo.framework.data.mybatisplus.model.BaseOwnEntity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -8,33 +9,49 @@ import lombok.ToString;
@TableName(value = "bpm_dict_data", autoResultMap = true)
@Data
@ToString(callSuper = true)
public class BpmDictDataDO extends BpmBaseDO{
public class BpmDictDataDO extends BaseOwnEntity<BpmDictDataDO> {
/**
* 编号，自增
*/
@TableId
private Long id;
/** 字典排序 */
/**
* 字典排序
*/
private Long sort;
/** 字典标签 */
/**
* 字典标签
*/
private String label;
/** 字典键值 */
/**
* 字典键值
*/
private String value;
/** 字典类型 */
/**
* 字典类型
*/
private String dictType;
/** 颜色类型 */
/**
* 颜色类型
*/
private String colorType;
/** css 样式 */
/**
* css 样式
*/
private String cssClass;
/**备注*/
/**
* 备注
*/
private String remark;
/** 状态（0正常 1停用） */
private String status;
/**
* 状态（0正常 1停用）
*/
private Integer status;
}

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmProcessDefinitionExtDO.java → workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/ProcessDefinitionExtDO.java
View File

@ -1,10 +1,12 @@
package cn.axzo.workflow.core.repository.entity;
import cn.axzo.framework.data.mybatisplus.model.BaseOwnEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import org.flowable.engine.repository.ProcessDefinition;
import java.util.List;
import java.util.Map;
@ -23,7 +25,7 @@ import java.util.Map;
@NoArgsConstructor
@AllArgsConstructor
// TODO 该表是否有用有待确定
public class BpmProcessDefinitionExtDO extends BpmBaseDO{
public class ProcessDefinitionExtDO extends BaseOwnEntity<ProcessDefinitionExtDO> {
/**
* 编号

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/BpmTaskExtDO.java → workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/entity/TaskExtDO.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.core.repository.entity;
import cn.axzo.framework.data.mybatisplus.model.BaseOwnEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -13,7 +14,7 @@ import java.util.Map;
@TableName(value = "bpm_task_ext", autoResultMap = true)
@Data
@ToString(callSuper = true)
public class BpmTaskExtDO extends BpmBaseDO{
public class TaskExtDO extends BaseOwnEntity<TaskExtDO> {
/**
* 编号，自增

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/BpmProcessDefinitionExtMapper.java
View File

@ -1,18 +1,18 @@
package cn.axzo.workflow.core.repository.mapper;
import cn.axzo.workflow.core.repository.entity.BpmProcessDefinitionExtDO;
import cn.axzo.workflow.core.repository.entity.ProcessDefinitionExtDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
@Mapper
public interface BpmProcessDefinitionExtMapper extends BaseMapperX<BpmProcessDefinitionExtDO> {
default List<BpmProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) {
public interface BpmProcessDefinitionExtMapper extends BaseMapperX<ProcessDefinitionExtDO> {
default List<ProcessDefinitionExtDO> selectListByProcessDefinitionIds(Collection<String> processDefinitionIds) {
return selectList("process_definition_id", processDefinitionIds);
}
default BpmProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) {
default ProcessDefinitionExtDO selectByProcessDefinitionId(String processDefinitionId) {
return selectOne("process_definition_id", processDefinitionId);
}
}

19
workflow-engine-core/src/main/java/cn/axzo/workflow/core/repository/mapper/BpmTaskExtMapper.java
View File

@ -1,29 +1,28 @@
package cn.axzo.workflow.core.repository.mapper;
import cn.axzo.workflow.core.repository.entity.BpmTaskExtDO;
import cn.axzo.workflow.core.repository.entity.TaskExtDO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
@Mapper
public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
default void updateByTaskId(BpmTaskExtDO entity) {
public interface BpmTaskExtMapper extends BaseMapperX<TaskExtDO> {
default void updateByTaskId(TaskExtDO entity) {
update(entity,
new LambdaQueryWrapper<BpmTaskExtDO>().eq(BpmTaskExtDO::getTaskId, entity.getTaskId()));
new LambdaQueryWrapper<TaskExtDO>().eq(TaskExtDO::getTaskId, entity.getTaskId()));
}
default List<BpmTaskExtDO> selectListByTaskIds(Collection<String> taskIds) {
return selectList(BpmTaskExtDO::getTaskId, taskIds);
default List<TaskExtDO> selectListByTaskIds(Collection<String> taskIds) {
return selectList(TaskExtDO::getTaskId, taskIds);
}
default List<BpmTaskExtDO> selectListByProcessInstanceId(String processInstanceId) {
default List<TaskExtDO> selectListByProcessInstanceId(String processInstanceId) {
return selectList("process_instance_id", processInstanceId);
}
default BpmTaskExtDO selectByTaskId(String taskId) {
return selectOne(BpmTaskExtDO::getTaskId, taskId);
default TaskExtDO selectByTaskId(String taskId) {
return selectOne(TaskExtDO::getTaskId, taskId);
}
}

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/BpmCategoryService.java
View File

@ -5,6 +5,7 @@ import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryCreateDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryUpdateDTO;
import cn.axzo.workflow.core.service.dto.response.model.BpmCategoryItemVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -22,10 +23,10 @@ public interface BpmCategoryService {
/**
* 修改
* @param createDTO
* @param updateDTO
* @return
*/
int updateBpmCategory(BpmCategoryUpdateDTO createDTO);
int updateBpmCategory(BpmCategoryUpdateDTO updateDTO);
/**
* 删除
@ -36,8 +37,9 @@ public interface BpmCategoryService {
/**
* 查询
*
* @param findDTO
* @return
*/
List<BpmCategoryItemVo> findBpmCategory(BpmCategoryDTO findDTO);
Page<BpmCategoryItemVo> findBpmCategory(BpmCategoryDTO findDTO);
}

8
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmProcessDefinitionConvert.java
View File

@ -1,7 +1,7 @@
package cn.axzo.workflow.core.service.converter;
import cn.axzo.workflow.core.common.utils.BpmCollectionUtils;
import cn.axzo.workflow.core.repository.entity.BpmProcessDefinitionExtDO;
import cn.axzo.workflow.core.repository.entity.ProcessDefinitionExtDO;
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessDefinitionPageItemRespVO;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.repository.Deployment;
@ -17,19 +17,19 @@ public class BpmProcessDefinitionConvert {
public static List<BpmProcessDefinitionPageItemRespVO> convertList(List<ProcessDefinition> list,
Map<String, Deployment> deploymentMap,
Map<String, BpmProcessDefinitionExtDO> processDefinitionDOMap,
Map<String, ProcessDefinitionExtDO> processDefinitionDOMap,
Integer version) {
return BpmCollectionUtils.convertList(list, definition -> {
Deployment deployment =
definition.getDeploymentId() != null ? deploymentMap.get(definition.getDeploymentId())
: null;
BpmProcessDefinitionExtDO definitionDO = processDefinitionDOMap.get(definition.getId());
ProcessDefinitionExtDO definitionDO = processDefinitionDOMap.get(definition.getId());
return convert(definition, deployment, definitionDO, version);
});
}
public static BpmProcessDefinitionPageItemRespVO convert(ProcessDefinition bean, Deployment deployment,
BpmProcessDefinitionExtDO processDefinitionExtDO, Integer version) {
ProcessDefinitionExtDO processDefinitionExtDO, Integer version) {
BpmProcessDefinitionPageItemRespVO respVO = convert(bean);
if (Objects.nonNull(version) && bean.getVersion() > version) {
respVO.setSyncModelPool(false);

13
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmTaskConvert.java
View File

@ -1,7 +1,7 @@
package cn.axzo.workflow.core.service.converter;
import cn.axzo.workflow.core.common.utils.BpmCollectionUtils;
import cn.axzo.workflow.core.repository.entity.BpmTaskExtDO;
import cn.axzo.workflow.core.repository.entity.TaskExtDO;
import cn.axzo.workflow.core.service.dto.response.task.BpmTaskDonePageItemRespVO;
import cn.axzo.workflow.core.service.dto.response.task.BpmTaskTodoPageItemRespVO;
import cn.hutool.core.util.StrUtil;
@ -12,7 +12,6 @@ import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.service.delegate.DelegateTask;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
import org.springframework.beans.BeanUtils;
@ -21,27 +20,27 @@ import java.util.Map;
public class BpmTaskConvert {
public static BpmTaskExtDO convertTaskExt(DelegateTask task) {
public static TaskExtDO convertTaskExt(DelegateTask task) {
String assignee = task.getAssignee();
BpmTaskExtDO taskExtDO = new BpmTaskExtDO();
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setTenantId(task.getTenantId());
taskExtDO.setIdentityId(Long.valueOf(assignee));
taskExtDO.setProcessDefinitionId(task.getProcessDefinitionId());
taskExtDO.setProcessInstanceId(task.getProcessInstanceId());
taskExtDO.setName(task.getName());
taskExtDO.setCreateTime(task.getCreateTime());
taskExtDO.setCreateAt(task.getCreateTime());
taskExtDO.setUserName(task.getOwner());
return taskExtDO;
}
public static List<BpmTaskDonePageItemRespVO> convertList2(List<HistoricTaskInstance> tasks,
Map<String, BpmTaskExtDO> bpmTaskExtDOMap,
Map<String, TaskExtDO> bpmTaskExtDOMap,
Map<String, HistoricProcessInstance> historicProcessInstanceMap) {
return BpmCollectionUtils.convertList(tasks, task -> {
BpmTaskDonePageItemRespVO respVO = convert2(task);
BpmTaskExtDO taskExtDO = bpmTaskExtDOMap.get(task.getId());
TaskExtDO taskExtDO = bpmTaskExtDOMap.get(task.getId());
BeanUtils.copyProperties(taskExtDO, respVO);
HistoricProcessInstance processInstance = historicProcessInstanceMap.get(
task.getProcessInstanceId());

24
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/model/BpmCategoryCreateDTO.java
View File

@ -1,7 +1,9 @@
package cn.axzo.workflow.core.service.dto.request.model;
import io.swagger.annotations.ApiModelProperty;
import liquibase.pro.packaged.B;
import lombok.Data;
import org.checkerframework.checker.units.qual.A;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
@ -9,17 +11,33 @@ import javax.validation.constraints.NotBlank;
@Data
public class BpmCategoryCreateDTO {
@ApiModelProperty(value = "字典标签", example = "process_yudao", hidden = true)
@ApiModelProperty(value = "字典标签", example = "新业务")
@Length(max = 50, message = "字典标签最长只支持255个字符")
@NotBlank(message = "字典标签表示不能为空")
private String label;
@ApiModelProperty(value = "流程模型标识", example = "process_yudao", hidden = true)
@ApiModelProperty(value = "字典值", example = "new_business")
@Length(max = 50, message = "字典值最长只支持50个字符")
@NotBlank(message = "字典值表示不能为空")
private String value;
@ApiModelProperty(value = "备注", example = "process_yudao", hidden = true)
@ApiModelProperty(value = "字典类型", example = "字典类型(用于字典分组)")
private String dictType;
@ApiModelProperty(value = "备注", example = "remark")
@Length(max = 250, message = "备注最长只支持250个字符")
private String remark;
@ApiModelProperty(value = "字典排序", example = "1", hidden = true)
private Integer sort;
@ApiModelProperty(value = "状态", example = "true or false", hidden = true)
private Boolean status;
@ApiModelProperty(value = "颜色类型", example = "对应到 element-ui 为 default、primary、success、info、warning、danger", hidden = true)
private String colorType;
@ApiModelProperty(value = "CSS样式", example = "", hidden = true)
private String cssClass;
}

9
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/model/BpmCategoryDTO.java
View File

@ -1,16 +1,17 @@
package cn.axzo.workflow.core.service.dto.request.model;
import cn.axzo.framework.domain.page.PageQO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class BpmCategoryDTO {
@ApiModelProperty(value = "字典类型", example = "process_yudao", notes = "精准匹配")
public class BpmCategoryDTO extends PageQO {
@ApiModelProperty(value = "字典类型", example = "dict_group", notes = "精准匹配")
private String dictType;
@ApiModelProperty(value = "字典标签", example = "process_yudao", hidden = true)
@ApiModelProperty(value = "字典标签", example = "新业务")
private String label;
@ApiModelProperty(value = "字典值", example = "process_yudao", hidden = true)
@ApiModelProperty(value = "字典值", example = "new_business")
private String value;
}

22
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/model/BpmCategoryUpdateDTO.java
View File

@ -2,28 +2,14 @@ package cn.axzo.workflow.core.service.dto.request.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@Data
public class BpmCategoryUpdateDTO {
public class BpmCategoryUpdateDTO extends BpmCategoryCreateDTO{
@ApiModelProperty(value = "ID", example = "process_yudao", hidden = true)
@NotBlank(message = "字典标签表示不能为空")
@ApiModelProperty(value = "ID", example = "1")
@NotNull(message = "字典标签表示不能为空")
private Long id;
@ApiModelProperty(value = "字典标签", example = "process_yudao", hidden = true)
@Length(max = 50, message = "字典标签最长只支持255个字符")
@NotBlank(message = "字典标签表示不能为空")
private String label;
@ApiModelProperty(value = "流程模型标识", example = "process_yudao", hidden = true)
@Length(max = 50, message = "字典值最长只支持50个字符")
@NotBlank(message = "字典值表示不能为空")
private String value;
@ApiModelProperty(value = "备注", example = "process_yudao", hidden = true)
@Length(max = 250, message = "备注最长只支持250个字符")
private String remark;
}

41
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmCategoryServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.axzo.workflow.core.service.impl;
import cn.axzo.workflow.core.constants.BpmnConstants;
import cn.axzo.workflow.core.repository.entity.BpmDictDataDO;
import cn.axzo.workflow.core.repository.mapper.BpmDictDataMapper;
import cn.axzo.workflow.core.service.BpmCategoryService;
@ -10,6 +11,7 @@ import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryUpdateDTO;
import cn.axzo.workflow.core.service.dto.response.model.BpmCategoryItemVo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -22,7 +24,7 @@ import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@Slf4j
public class BpmCategoryServiceImpl implements BpmCategoryService {
public class BpmCategoryServiceImpl implements BpmCategoryService, BpmnConstants {
@Resource
private BpmDictDataMapper bpmDictDataMapper;
@ -30,8 +32,8 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
@Override
public int createBpmCategory(BpmCategoryCreateDTO createDTO) {
BpmDictDataDO bpmDictDataDO =new BpmDictDataDO();
bpmDictDataDO.setDictType("bpm_model_category");
BpmDictDataDO bpmDictDataDO = new BpmDictDataDO();
bpmDictDataDO.setDictType(BPM_MODEL_CATEGORY);
bpmDictDataDO.setLabel(createDTO.getLabel());
bpmDictDataDO.setValue(createDTO.getValue());
bpmDictDataDO.setRemark(createDTO.getRemark());
@ -39,13 +41,13 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
}
@Override
public int updateBpmCategory(BpmCategoryUpdateDTO createDTO) {
BpmDictDataDO bpmDictDataDO =new BpmDictDataDO();
bpmDictDataDO.setId(createDTO.getId());
bpmDictDataDO.setDictType("bpm_model_category");
bpmDictDataDO.setLabel(createDTO.getLabel());
bpmDictDataDO.setValue(createDTO.getValue());
bpmDictDataDO.setRemark(createDTO.getRemark());
public int updateBpmCategory(BpmCategoryUpdateDTO updateDTO) {
BpmDictDataDO bpmDictDataDO = new BpmDictDataDO();
bpmDictDataDO.setId(updateDTO.getId());
bpmDictDataDO.setDictType(BPM_MODEL_CATEGORY);
bpmDictDataDO.setLabel(updateDTO.getLabel());
bpmDictDataDO.setValue(updateDTO.getValue());
bpmDictDataDO.setRemark(updateDTO.getRemark());
return bpmDictDataMapper.updateById(bpmDictDataDO);
}
@ -55,15 +57,24 @@ public class BpmCategoryServiceImpl implements BpmCategoryService {
}
@Override
public List<BpmCategoryItemVo> findBpmCategory(BpmCategoryDTO findDTO) {
public Page<BpmCategoryItemVo> findBpmCategory(BpmCategoryDTO findDTO) {
LambdaQueryWrapper<BpmDictDataDO> queryWrapper = Wrappers.lambdaQuery(BpmDictDataDO.class)
.eq(StringUtils.isNotBlank(findDTO.getDictType()), BpmDictDataDO::getDictType, findDTO.getDictType())
.eq(StringUtils.isNotBlank(findDTO.getLabel()), BpmDictDataDO::getLabel, findDTO.getLabel());
.eq(StringUtils.isNotBlank(findDTO.getLabel()), BpmDictDataDO::getLabel, findDTO.getLabel())
.eq(StringUtils.isNotBlank(findDTO.getValue()), BpmDictDataDO::getValue, findDTO.getValue());
List<BpmDictDataDO> bpmDictDataDO = bpmDictDataMapper.selectList(queryWrapper);
Page<BpmDictDataDO> page = bpmDictDataMapper.selectPage(findDTO.toPage(), queryWrapper);
List<BpmCategoryItemVo> categoryVOS = bpmDictDataDO.stream().map(bpmCategoryConverter::toVo).collect(Collectors.toList());
return categoryVOS;
List<BpmCategoryItemVo> categoryVOS =
page.getRecords().stream().map(bpmCategoryConverter::toVo).collect(Collectors.toList());
Page<BpmCategoryItemVo> result = new Page<>();
result.setRecords(categoryVOS);
result.setSize(page.getSize());
result.setTotal(page.getTotal());
result.setCurrent(page.getCurrent());
return result;
}
}

11
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmProcessDefinitionServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.axzo.workflow.core.service.impl;
import cn.axzo.workflow.core.common.utils.BpmCollectionUtils;
import cn.axzo.workflow.core.repository.entity.BpmProcessDefinitionExtDO;
import cn.axzo.workflow.core.repository.entity.ProcessDefinitionExtDO;
import cn.axzo.workflow.core.repository.mapper.BpmProcessDefinitionExtMapper;
import cn.axzo.workflow.core.service.converter.BpmProcessDefinitionConvert;
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessDefinitionPageDTO;
@ -10,7 +10,6 @@ import cn.axzo.workflow.core.service.dto.response.process.BpmProcessDefinitionPa
import cn.axzo.workflow.core.service.BpmProcessDefinitionService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.common.engine.impl.db.SuspensionState;
@ -73,7 +72,7 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
}
// 插入拓展表
BpmProcessDefinitionExtDO definitionDO = new BpmProcessDefinitionExtDO();
ProcessDefinitionExtDO definitionDO = new ProcessDefinitionExtDO();
definitionDO.setModelId(model.getId());
BeanUtils.copyProperties(definition, definitionDO);
definitionDO.setProcessDefinitionId(definition.getId());
@ -124,10 +123,10 @@ public class BpmProcessDefinitionServiceImpl implements BpmProcessDefinitionServ
Map<String, Deployment> deploymentMap = getDeploymentMap(deploymentIds);
// 获得 BpmProcessDefinitionDO Map
List<BpmProcessDefinitionExtDO> processDefinitionDOs = processDefinitionExtMapper.selectListByProcessDefinitionIds(
List<ProcessDefinitionExtDO> processDefinitionDOs = processDefinitionExtMapper.selectListByProcessDefinitionIds(
convertList(processDefinitions, ProcessDefinition::getId));
Map<String, BpmProcessDefinitionExtDO> processDefinitionDOMap = convertMap(processDefinitionDOs,
BpmProcessDefinitionExtDO::getProcessDefinitionId);
Map<String, ProcessDefinitionExtDO> processDefinitionDOMap = convertMap(processDefinitionDOs,
ProcessDefinitionExtDO::getProcessDefinitionId);
List<Model> list = repositoryService.createModelQuery().modelKey(request.getKey()).list();

20
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/BpmTaskServiceImpl.java
View File

@ -6,7 +6,7 @@ import cn.axzo.workflow.core.common.enums.BpmProcessInstanceResultEnum;
import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
import cn.axzo.workflow.core.common.utils.BpmCollectionUtils;
import cn.axzo.workflow.core.repository.entity.BpmProcessInstanceExtDO;
import cn.axzo.workflow.core.repository.entity.BpmTaskExtDO;
import cn.axzo.workflow.core.repository.entity.TaskExtDO;
import cn.axzo.workflow.core.repository.mapper.BpmProcessInstanceExtMapper;
import cn.axzo.workflow.core.repository.mapper.BpmTaskExtMapper;
import cn.axzo.workflow.core.service.BpmTaskService;
@ -162,9 +162,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
}
// 获得 TaskExtDO Map
List<BpmTaskExtDO> bpmTaskExtDOs = taskExtMapper.selectListByTaskIds(
List<TaskExtDO> bpmTaskExtDOs = taskExtMapper.selectListByTaskIds(
convertSet(tasks, HistoricTaskInstance::getId));
Map<String, BpmTaskExtDO> bpmTaskExtDOMap = convertMap(bpmTaskExtDOs, BpmTaskExtDO::getTaskId);
Map<String, TaskExtDO> bpmTaskExtDOMap = convertMap(bpmTaskExtDOs, TaskExtDO::getTaskId);
// 获得 ProcessInstance Map
Set<String> processInstanceIds = convertSet(tasks, HistoricTaskInstance::getProcessInstanceId);
Map<String, HistoricProcessInstance> historicProcessInstanceMap = processInstanceService.getHistoricProcessInstanceMap(
@ -217,7 +217,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
// 此时需要将该任务所在多实例任务节点中的其他子任务，更新任务拓展表为已完成
for (Task taskRunningBefore : taskRunningListBefore) {
if (!task.getId().equals(taskRunningBefore.getId())) {
BpmTaskExtDO taskExtDO = new BpmTaskExtDO();
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(taskRunningBefore.getId());
taskExtDO.setResult(BpmProcessInstanceResultEnum.APPROVE.getResult());
taskExtDO.setComment("自动完成");
@ -226,7 +226,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
}
}
}
BpmTaskExtDO taskExtDO = new BpmTaskExtDO();
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setResult(BpmProcessInstanceResultEnum.APPROVE.getResult());
taskExtDO.setComment(taskAuditDTO.getComment());
@ -262,7 +262,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
runtimeService.setVariables(instance.getProcessInstanceId(), variables);
// 更新任务拓展表为不通过
BpmTaskExtDO taskExtDO = new BpmTaskExtDO();
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setResult(BpmProcessInstanceResultEnum.REJECT.getResult());
taskExtDO.setComment(taskAuditDTO.getComment());
@ -320,13 +320,13 @@ public class BpmTaskServiceImpl implements BpmTaskService {
}
public void createTaskExt(DelegateTask task) {
BpmTaskExtDO taskExtDO = BpmTaskConvert.convertTaskExt(task);
TaskExtDO taskExtDO = BpmTaskConvert.convertTaskExt(task);
taskExtDO.setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
taskExtMapper.insert(taskExtDO);
}
public void updateTaskExtComplete(DelegateTask task) {
BpmTaskExtDO taskExtDO = BpmTaskConvert.convertTaskExt(task);
TaskExtDO taskExtDO = BpmTaskConvert.convertTaskExt(task);
taskExtDO.setEndTime(new Date());
taskExtMapper.updateByTaskId(taskExtDO);
}
@ -336,7 +336,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
String processDefinitionId = task.getProcessDefinitionId();
String taskDefinitionKey = task.getTaskDefinitionKey();
// 在获取候选人列表时，向bpm_task_assignee_info表中插入选择的审批人的信息，在这里更新bpm_task_exe表时，通过task_id从bpm_task_assigner_info表中获取审批人的完整信息
BpmTaskExtDO taskExtDO = new BpmTaskExtDO();
TaskExtDO taskExtDO = new TaskExtDO();
taskExtDO.setTaskId(task.getId());
taskExtDO.setTenantId(task.getTenantId());
taskExtDO.setIdentityId(Long.valueOf(task.getAssignee()));
@ -359,7 +359,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
}
// 如果任务拓展表已经是完成的状态，则跳过
BpmTaskExtDO taskExt = taskExtMapper.selectByTaskId(taskId);
TaskExtDO taskExt = taskExtMapper.selectByTaskId(taskId);
if (taskExt == null) {
log.error("[updateTaskExtCancel][taskId({}) 查找不到对应的记录，可能存在问题]", taskId);
return;

7
workflow-engine-core/src/main/resources/sql/change.sql Normal file
View File

@ -0,0 +1,7 @@
ALTER TABLE `bpm_dict_data`
CHANGE COLUMN `creator` `create_by` varchar (64) NULL DEFAULT '' COMMENT '创建者' AFTER `remark`,
CHANGE COLUMN `create_time` `create_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间' AFTER `create_by`,
CHANGE COLUMN `updater` `update_by` varchar (64) NULL DEFAULT '' COMMENT '更新者' AFTER `create_at`,
CHANGE COLUMN `update_time` `update_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON
UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' AFTER `update_by`,
CHANGE COLUMN `deleted` `is_delete` bigint NOT NULL DEFAULT b'0' COMMENT '是否删除' AFTER `update_at`;

20
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmCategoryController.java
View File

@ -1,15 +1,15 @@
package cn.axzo.server.controller.web;
import cn.axzo.framework.jackson.utility.JSON;
import cn.axzo.framework.web.http.ApiResponse;
import cn.axzo.workflow.core.service.BpmCategoryService;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryCreateDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmCategoryUpdateDTO;
import cn.axzo.workflow.core.service.dto.response.model.BpmCategoryItemVo;
import cn.azxo.framework.common.model.CommonPageResponse;
import cn.azxo.framework.common.model.CommonResponse;
import io.swagger.annotations.ApiOperation;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.PageList;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,15 +26,15 @@ public class BpmCategoryController {
@Autowired
private BpmCategoryService bpmCategoryService;
@PostMapping("/create")
@PutMapping("/create")
public CommonResponse<String> create(@Valid @RequestBody BpmCategoryCreateDTO dto) {
log.info("创建Category===>>>参数：{}", JSON.toJSONString(dto));
bpmCategoryService.createBpmCategory(dto);
bpmCategoryService.createBpmCategory(dto);
return CommonResponse.success();
}
@PutMapping("/update")
@PostMapping("/update")
public CommonResponse<String> update(@Valid @RequestBody BpmCategoryUpdateDTO dto) {
log.info("更新Category===>>>参数：{}", JSON.toJSONString(dto));
bpmCategoryService.updateBpmCategory(dto);
@ -43,9 +43,9 @@ public class BpmCategoryController {
@GetMapping("/list")
public CommonResponse<List<BpmCategoryItemVo>> list(@RequestBody BpmCategoryDTO qo) {
public CommonResponse<IPage<BpmCategoryItemVo>> list(BpmCategoryDTO qo) {
log.info("查询Category===>>>列表接口参数，{}", JSON.toJSONString(qo));
List<BpmCategoryItemVo> bpmCategory = bpmCategoryService.findBpmCategory(qo);
Page<BpmCategoryItemVo> bpmCategory = bpmCategoryService.findBpmCategory(qo);
return CommonResponse.success(bpmCategory);
}

2
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmModelController.java
View File

@ -1,6 +1,5 @@
package cn.axzo.server.controller.web;
import cn.axzo.framework.jackson.utility.JSON;
import cn.axzo.workflow.core.service.BpmModelService;
import cn.axzo.workflow.core.service.dto.request.model.BpmModelBpmPageDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmModelCreateDTO;
@ -9,6 +8,7 @@ import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
import cn.axzo.workflow.core.service.dto.response.model.BpmModelDetailVO;
import cn.axzo.workflow.core.service.dto.response.model.BpmModelPageItemVO;
import cn.azxo.framework.common.model.CommonResponse;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

5
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessDefinitionController.java
View File

@ -1,14 +1,11 @@
package cn.axzo.server.controller.web;
import cn.axzo.framework.jackson.utility.JSON;
import cn.axzo.workflow.core.service.BpmProcessDefinitionService;
import cn.axzo.workflow.core.service.dto.request.model.BpmModelBpmPageDTO;
import cn.axzo.workflow.core.service.dto.request.model.BpmModelCreateDTO;
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessDefinitionPageDTO;
import cn.axzo.workflow.core.service.dto.response.BpmPageResult;
import cn.axzo.workflow.core.service.dto.response.model.BpmModelPageItemVO;
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessDefinitionPageItemRespVO;
import cn.azxo.framework.common.model.CommonResponse;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.flowable.common.engine.impl.db.SuspensionState;
import org.flowable.engine.repository.Model;

2
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmProcessInstanceController.java
View File

@ -1,11 +1,11 @@
package cn.axzo.server.controller.web;
import cn.axzo.framework.jackson.utility.JSON;
import cn.axzo.workflow.core.service.BpmProcessInstanceService;
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceCreateDTO;
import cn.axzo.workflow.core.service.dto.response.process.BpmProcessInstanceVO;
import cn.axzo.workflow.core.service.dto.request.process.BpmProcessInstanceWithdrawDTO;
import cn.azxo.framework.common.model.CommonResponse;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;

10
workflow-engine-server/src/main/java/cn/axzo/server/controller/web/BpmTaskController.java
View File

@ -1,16 +1,10 @@
package cn.axzo.server.controller.web;
import cn.axzo.workflow.core.service.BpmTaskService;
import cn.axzo.workflow.core.service.dto.request.task.BpmTaskAuditDTO;
import cn.axzo.workflow.core.service.dto.request.task.BpmTaskTodoBpmPageDTO;
import cn.azxo.framework.common.model.CommonResponse;
import lombok.extern.slf4j.Slf4j;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RequestMapping("/web/v1/api/BpmTask")

12
workflow-engine-server/src/main/resources/application.yml
View File

@ -3,7 +3,7 @@ server:
spring:
main:
alow-bean-definition-overriding: true
allow-bean-definition-overriding: true
cloud:
config:
override-none: true
@ -60,8 +60,8 @@ debug: true
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://121.36.251.132:3006/workflow?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false&verifyServerCertificate=false
type: com.zaxxer.hikari.HikariDataSource
username: workflow
password: z4P1r7cj1B3Vg94y
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://121.36.251.132:3006/workflow?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false&verifyServerCertificate=false
type: com.zaxxer.hikari.HikariDataSource
username: workflow
password: z4P1r7cj1B3Vg94y