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

update - 调整查询黑白名单配置排序规则

Browse Source
This commit is contained in:
wangli 2024-01-08 20:08:49 +08:00
parent 9c7bbe864a
commit 633ad65f64
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
View File

@ -24,7 +24,9 @@ public enum BpmnTaskRespCode implements IModuleRespCode {
ACTIVITY_CANT_SET_ASSIGNEE("009", "当前节点状态不允许设置审批人"),
CANT_CREATE_SUB_TASK("010", "父任务不存在, 不允许创建子任务"),
DUMMY_TASK_NOT_EXISTS("011", "机器人节点不存在, 实例 ID: 【{}】, 任务 ID: 【{}】"),
DUMMY_TASK_CREATED_NOT_SUPPORT("012", "当前审批已结束, 不支撑创建机器人节点, 实例 ID: 【{}】"),
DUMMY_TASK_CREATED_NOT_SUPPORT("012", "当前审批已结束, 不支持创建机器人节点, 实例 ID: 【{}】"),
DUMMY_TASK_CANT_CREATED("013", "不允许创建新的机器人节点, 实例 ID: 【{}】"),
DUMMY_TASK_CANT_REPEAT_CREATE("014", "已存在运行中的机器人节点, 不允许重复创建!"),
;
private String code;

13
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java
View File

@ -25,9 +25,12 @@ import java.util.List;
import java.util.Objects;
import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC;
import static cn.axzo.workflow.common.constant.BpmnConstants.DUMMY_ASSIGNEE_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.DUMMY_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.HIDDEN_ASSIGNEE_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_ASSIGNEE_SKIP_FLAT;
import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_CREATED;
import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.DUMMY_TASK_CANT_REPEAT_CREATE;
import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.DUMMY_TASK_CREATED_NOT_SUPPORT;
import static org.flowable.task.api.Task.DEFAULT_PRIORITY;
@ -72,7 +75,17 @@ public class CustomCreateDummyTaskCmd implements Command<String>, Serializable {
BpmnProcessInstanceResultEnum.PROCESSING.getStatus())) {
throw new WorkflowEngineException(DUMMY_TASK_CREATED_NOT_SUPPORT, processInstanceId);
}
TaskService taskService = processEngineConfiguration.getTaskService();
List<Task> activeTaskList = taskService.createTaskQuery().processInstanceId(processInstanceId).active().list();
activeTaskList.stream().filter(task -> Objects.equals(task.getAssignee(), DUMMY_ASSIGNEE_ID)).findAny().ifPresent(task -> {
throw new WorkflowEngineException(DUMMY_TASK_CANT_CREATED, processInstanceId);
});
activeTaskList.stream().filter(task -> Objects.equals(task.getTaskDefinitionKey(), DUMMY_ID)).findAny().ifPresent(task -> {
throw new WorkflowEngineException(DUMMY_TASK_CANT_REPEAT_CREATE);
});
IdGenerator idGenerator = processEngineConfiguration.getIdGenerator();
TaskEntity task = (TaskEntity) taskService.newTask(idGenerator.getNextId());

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/CategoryConfigServiceImpl.java
View File

@ -61,7 +61,8 @@ public class CategoryConfigServiceImpl extends ServiceImpl<ExtAxDictConfMapper,
.eq(StringUtils.hasLength(dto.getConfigType()), ExtAxDictConf::getConfigType, dto.getConfigType())
.eq(Objects.nonNull(dto.getWorkspaceId()), ExtAxDictConf::getWorkspaceId, dto.getWorkspaceId())
.like(StringUtils.hasLength(dto.getOperationName()), ExtAxDictConf::getOperationName,
dto.getOperationName());
dto.getOperationName())
.orderByDesc(ExtAxDictConf::getCreateAt);
Page<ExtAxDictConf> page = dictConfMapper.selectPage(new Page<>(dto.getPageNo(), dto.getPageSize()),
queryWrapper);