|
@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.apache.dubbo.config.annotation.DubboReference; |
|
|
import org.apache.dubbo.config.annotation.DubboReference; |
|
|
import org.dromara.business.api.RemoteBusinessAlertService; |
|
|
|
|
|
import org.dromara.common.core.enums.BusinessStatusEnum; |
|
|
import org.dromara.common.core.enums.BusinessStatusEnum; |
|
|
import org.dromara.common.core.exception.ServiceException; |
|
|
import org.dromara.common.core.exception.ServiceException; |
|
|
import org.dromara.common.core.utils.SpringUtils; |
|
|
import org.dromara.common.core.utils.SpringUtils; |
|
@ -22,13 +21,9 @@ import org.dromara.common.core.utils.StringUtils; |
|
|
import org.dromara.common.core.utils.ValidatorUtils; |
|
|
import org.dromara.common.core.utils.ValidatorUtils; |
|
|
import org.dromara.common.core.validate.AddGroup; |
|
|
import org.dromara.common.core.validate.AddGroup; |
|
|
import org.dromara.common.core.validate.EditGroup; |
|
|
import org.dromara.common.core.validate.EditGroup; |
|
|
import org.dromara.common.mail.utils.MailUtils; |
|
|
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.PageQuery; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.satoken.utils.LoginHelper; |
|
|
import org.dromara.common.sse.dto.SseMessageDto; |
|
|
|
|
|
import org.dromara.common.sse.utils.SseMessageUtils; |
|
|
|
|
|
import org.dromara.resource.api.RemoteMessageService; |
|
|
|
|
|
import org.dromara.system.api.RemoteUserService; |
|
|
import org.dromara.system.api.RemoteUserService; |
|
|
import org.dromara.system.api.domain.vo.RemoteUserVo; |
|
|
import org.dromara.system.api.domain.vo.RemoteUserVo; |
|
|
import org.dromara.warm.flow.core.dto.FlowParams; |
|
|
import org.dromara.warm.flow.core.dto.FlowParams; |
|
@ -40,13 +35,13 @@ import org.dromara.warm.flow.orm.entity.*; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; |
|
|
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper; |
|
|
import org.dromara.workflow.api.domain.FlowDepartVo; |
|
|
import org.dromara.workflow.api.domain.FlowLabelVo; |
|
|
import org.dromara.workflow.api.domain.RemoteStartProcessReturn; |
|
|
import org.dromara.workflow.api.domain.RemoteStartProcessReturn; |
|
|
import org.dromara.workflow.common.ConditionalOnEnable; |
|
|
import org.dromara.workflow.common.ConditionalOnEnable; |
|
|
import org.dromara.workflow.common.enums.MessageTypeEnum; |
|
|
import org.dromara.workflow.common.enums.MessageTypeEnum; |
|
|
import org.dromara.workflow.common.enums.TaskAssigneeType; |
|
|
import org.dromara.workflow.common.enums.TaskAssigneeType; |
|
|
import org.dromara.workflow.common.enums.TaskStatusEnum; |
|
|
import org.dromara.workflow.common.enums.TaskStatusEnum; |
|
|
import org.dromara.workflow.domain.FlowDepart; |
|
|
import org.dromara.workflow.domain.FlowLabel; |
|
|
import org.dromara.workflow.domain.bo.*; |
|
|
import org.dromara.workflow.domain.bo.*; |
|
|
import org.dromara.workflow.domain.vo.FlowHisTaskVo; |
|
|
import org.dromara.workflow.domain.vo.FlowHisTaskVo; |
|
|
import org.dromara.workflow.domain.vo.FlowTaskVo; |
|
|
import org.dromara.workflow.domain.vo.FlowTaskVo; |
|
@ -54,7 +49,7 @@ import org.dromara.workflow.handler.FlowProcessEventHandler; |
|
|
import org.dromara.workflow.handler.WorkflowPermissionHandler; |
|
|
import org.dromara.workflow.handler.WorkflowPermissionHandler; |
|
|
import org.dromara.workflow.mapper.FlwCategoryMapper; |
|
|
import org.dromara.workflow.mapper.FlwCategoryMapper; |
|
|
import org.dromara.workflow.mapper.FlwTaskMapper; |
|
|
import org.dromara.workflow.mapper.FlwTaskMapper; |
|
|
import org.dromara.workflow.service.FlwDepartService; |
|
|
import org.dromara.workflow.service.FlwLabelService; |
|
|
import org.dromara.workflow.service.IFlwTaskService; |
|
|
import org.dromara.workflow.service.IFlwTaskService; |
|
|
import org.dromara.workflow.utils.WorkflowUtils; |
|
|
import org.dromara.workflow.utils.WorkflowUtils; |
|
|
import org.springframework.beans.BeanUtils; |
|
|
import org.springframework.beans.BeanUtils; |
|
@ -65,8 +60,6 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
import java.math.BigDecimal; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.concurrent.ScheduledExecutorService; |
|
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
import static org.dromara.workflow.common.constant.FlowConstant.*; |
|
|
import static org.dromara.workflow.common.constant.FlowConstant.*; |
|
@ -94,7 +87,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { |
|
|
private final FlowProcessEventHandler flowProcessEventHandler; |
|
|
private final FlowProcessEventHandler flowProcessEventHandler; |
|
|
private final FlwTaskMapper flwTaskMapper; |
|
|
private final FlwTaskMapper flwTaskMapper; |
|
|
private final FlwCategoryMapper flwCategoryMapper; |
|
|
private final FlwCategoryMapper flwCategoryMapper; |
|
|
private final FlwDepartService flwDepartService; |
|
|
private final FlwLabelService flwDepartService; |
|
|
@DubboReference |
|
|
@DubboReference |
|
|
private RemoteUserService remoteUserService; |
|
|
private RemoteUserService remoteUserService; |
|
|
|
|
|
|
|
@ -329,9 +322,9 @@ public class FlwTaskServiceImpl implements IFlwTaskService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public FlowDepartVo getFlowDepart(Long deptId) { |
|
|
public FlowLabelVo getFlowLabel(String labelId) { |
|
|
FlowDepart flowDepart = flwDepartService.getFlowDepart(deptId); |
|
|
FlowLabel flowDepart = flwDepartService.getFlowLabel(labelId); |
|
|
FlowDepartVo flowDepartVo = new FlowDepartVo(); |
|
|
FlowLabelVo flowDepartVo = new FlowLabelVo(); |
|
|
BeanUtils.copyProperties(flowDepart, flowDepartVo); |
|
|
BeanUtils.copyProperties(flowDepart, flowDepartVo); |
|
|
return flowDepartVo; |
|
|
return flowDepartVo; |
|
|
} |
|
|
} |
|
|