From 4525e8ba3bc715b2ffa28a9db6cc52808eecb1de Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 30 Jun 2023 16:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=AE=A1=E4=BA=BA=E5=91=98=20?= =?UTF-8?q?=E5=92=8C=20=E8=87=AA=E5=8A=A8=E4=B8=8B=E4=B8=80=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/scheduler/listener/CcTaskListener.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/listener/CcTaskListener.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/listener/CcTaskListener.java index 60659b6..19c92be 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/listener/CcTaskListener.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/listener/CcTaskListener.java @@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.cache.model.cache.CacheKey; import com.ningdatech.cache.repository.CachePlusOps; import com.ningdatech.pmapi.common.constant.BizConst; +import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; import com.ningdatech.pmapi.projectlib.service.IProjectInstService; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.ningdatech.pmapi.staging.enums.MsgTypeEnum; import com.ningdatech.pmapi.sys.manage.NoticeManage; +import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO; import com.wflow.bean.entity.WflowCcTasks; import com.wflow.service.WflowCcTasksService; import com.wflow.workflow.notify.event.CcTaskEvent; @@ -47,6 +49,8 @@ public class CcTaskListener { private final CachePlusOps cachePlusOps; + private final UserInfoHelper userInfoHelper; + private static final String DUP_KEY = "ccTasks"; private static final String NODE = "node:"; @@ -80,22 +84,33 @@ public class CcTaskListener { return; } + log.info("tasks :{}",tasks.size()); + tasks.stream().forEach(task -> { + log.info("cc tasks :{}",JSON.toJSONString(tasks)); + HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(instCode) .singleResult(); + log.info("instance :{}",JSON.toJSONString(instance)); + ProjectInst projectInst = projectInstService.getOne(Wrappers.lambdaQuery(ProjectInst.class) .eq(ProjectInst::getInstCode, instCode) .last(BizConst.LIMIT_1)); + + log.info("projectInst :{}",JSON.toJSONString(projectInst)); + if(Objects.isNull(projectInst) || Objects.isNull(instance)){ return; } Long projectId = projectInst.getProjectId(); Project project = projectService.getNewProject(projectId); + UserFullInfoDTO user = userInfoHelper.getUserFullInfoByEmployeeCode(task.getUserId()); + //发送消息 - noticeManage.sendNotice(task.getUserId(),93L,project,instance.getProcessDefinitionName(), + noticeManage.sendNotice(task.getUserId(),Objects.nonNull(user)? user.getUserId() : 93L,project,instance.getProcessDefinitionName(), CC_MSG_TEMPLATE, MsgTypeEnum.PROJECT_REVIEW_CC); }); }