abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化代码 修复bug

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-12-17 17:06:36 +08:00
parent e745ccc0cb
commit 25aac02e2b
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
View File

@ -44,7 +44,6 @@ import org.dromara.workflow.handler.WorkflowPermissionHandler;
import org.dromara.workflow.mapper.FlwTaskMapper; import org.dromara.workflow.mapper.FlwTaskMapper;
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.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -156,7 +155,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
Instance instance = taskService.skip(taskId, flowParams); Instance instance = taskService.skip(taskId, flowParams);
this.setHandler(instance, flowTask, flowCopyList); this.setHandler(instance, flowTask, flowCopyList);
// 消息通知 // 消息通知
sendMessage(definition.getFlowName(), ins.getId(), messageType, notice); WorkflowUtils.sendMessage(definition.getFlowName(), ins.getId(), messageType, notice);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -175,7 +174,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
if (ObjectUtil.isNull(instance)) { if (ObjectUtil.isNull(instance)) {
return; return;
} }
//添加抄送人 // 添加抄送人
this.setCopy(task, flowCopyList); this.setCopy(task, flowCopyList);
// 根据流程实例ID查询所有关联的任务 // 根据流程实例ID查询所有关联的任务
List<FlowTask> flowTasks = this.selectByInstId(instance.getId()); List<FlowTask> flowTasks = this.selectByInstId(instance.getId());
@ -204,7 +203,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
* @param task 任务信息 * @param task 任务信息
* @param flowCopyList 抄送人 * @param flowCopyList 抄送人
*/ */
@Async
public void setCopy(FlowTask task, List<FlowCopy> flowCopyList) { public void setCopy(FlowTask task, List<FlowCopy> flowCopyList) {
if (CollUtil.isEmpty(flowCopyList)) { if (CollUtil.isEmpty(flowCopyList)) {
return; return;
@ -399,8 +397,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
} }
} }
this.setHandler(instance, task, null); this.setHandler(instance, task, null);
//消息通知 // 消息通知
sendMessage(definition.getFlowName(), instance.getId(), messageType, notice); WorkflowUtils.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
return true; return true;
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
@ -408,18 +406,6 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
} }
} }
/**
* 发送消息
*
* @param flowName 流程定义名称
* @param messageType 消息类型
* @param notice 消息内容，为空则发送默认配置的消息内容
*/
@Async
public void sendMessage(String flowName, Long instId, List<String> messageType, String notice) {
WorkflowUtils.sendMessage(flowName, instId, messageType, notice);
}
/** /**
* 获取可驳回节点 * 获取可驳回节点
* *