diff --git a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java index 8462564..6b1ab16 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskAddExe.java @@ -19,15 +19,10 @@ import com.zcloud.domain.dto.ProjectTaskAddCmd; import com.zcloud.domain.dto.ProjectTaskGroupUserAddCmd; import com.zcloud.domain.dto.ProjectTaskInfoAddCmd; import com.zcloud.domain.dto.ProjectTaskScoreInfoAddCmd; -import com.zcloud.domain.persistence.dataobject.DomainDepartmentDO; -import com.zcloud.domain.persistence.dataobject.ProjectTaskGroupUserDO; -import com.zcloud.domain.persistence.dataobject.ProjectTaskInfoDO; -import com.zcloud.domain.persistence.dataobject.ProjectTaskScoreInfoDO; -import com.zcloud.domain.persistence.repository.DomainDepartmentRepository; -import com.zcloud.domain.persistence.repository.ProjectTaskGroupUserRepository; -import com.zcloud.domain.persistence.repository.ProjectTaskInfoRepository; -import com.zcloud.domain.persistence.repository.ProjectTaskScoreInfoRepository; +import com.zcloud.domain.persistence.dataobject.*; +import com.zcloud.domain.persistence.repository.*; import com.zcloud.gbscommon.todolistmq.TodoListEventPusherUtil; +import com.zcloud.gbscommon.todolistmq.event.TodoListAddBatchEvent; import com.zcloud.gbscommon.todolistmq.event.TodoListAddEvent; import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.UuidUtil; @@ -38,10 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -63,6 +55,7 @@ public class ProjectTaskAddExe { private final ProjectTaskScoreInfoCoConvertor projectTaskScoreInfoCoConvertor; private final DomainDepartmentRepository domainDepartmentRepository; private final TodoListEventPusherUtil todoListEventPusherUtil; + private final DomainGroupRepository domainGroupRepository; @DubboReference private MessageFacade messageFacade; @Transactional(rollbackFor = Exception.class) @@ -146,6 +139,8 @@ public class ProjectTaskAddExe { try{ String domainDepartmentId = projectTaskE.getDomainDepartmentId(); DomainDepartmentDO infoByUUID = domainDepartmentRepository.getInfoByUUID(domainDepartmentId); + DomainGroupDO infoByGroupId = domainGroupRepository.getInfoByGroupId(projectTaskE.getDomainGroupId()); + MessageSendCmd messageSendCmd = new MessageSendCmd(); messageSendCmd.setBusinessId(UuidUtil.get32UUID()); MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); @@ -160,8 +155,21 @@ public class ProjectTaskAddExe { SingleResponse d = messageFacade.send(messageSendCmd); log.info("评分完成消息提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d)); + messageSendCmd.setBusinessId(UuidUtil.get32UUID()); + MessageTargetCmd messageTargetCmdGroup = new MessageTargetCmd(); + messageTargetCmdGroup.setUserId(infoByGroupId.getTeamUserId()); + messageSendCmd.setTargetCmd(messageTargetCmdGroup); + messageSendCmd.setSourceCode("MS000105"); + messageSendCmd.setNeedTokenEnum(false); + messageSendCmd.setParams(sendParams); + + log.info("评分完成消息提醒发送消息参数:messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); + SingleResponse dd = messageFacade.send(messageSendCmd); + log.info("评分完成消息提醒发送消息结果:d: {}", JSONUtil.toJsonStr(dd)); + // 发送待办 + List todoListAddEventList = new ArrayList<>(); TodoListAddEvent event = new TodoListAddEvent(); event.setTitle("您有一条【专项领域】待处理"); event.setContent("待开始"); @@ -171,6 +179,24 @@ public class ProjectTaskAddExe { event.setPcFlag(1); // 是否PC端待办 1是 0否 event.setAppFlag(0); // 是否APP端待办 1是 0否 event.setOtherParams(new JSONObject()); + + todoListAddEventList.add(event); + + TodoListAddEvent event2 = new TodoListAddEvent(); + event2.setTitle("您有一条【专项领域】待处理"); + event2.setContent("待开始"); + event2.setForeignKey(projectTaskE.getId()); // 业务表ID -申请 + event2.setForeignSubsidiaryKey(projectTaskE.getId()); // 业务附表ID 没有附表时为foreignKey的值 + event2.setReceiveUser(infoByUUID.getMasterUserId());// user表ID + event2.setPcFlag(1); // 是否PC端待办 1是 0否 + event2.setAppFlag(0); // 是否APP端待办 1是 0否 + event2.setOtherParams(new JSONObject()); + + todoListAddEventList.add(event2); + + TodoListAddBatchEvent event3 = new TodoListAddBatchEvent(); + event3.setTodoListAddEventList(todoListAddEventList); + todoListEventPusherUtil.sendMessageAddBatchEvent(event3); todoListEventPusherUtil.sendMessageAddEvent( event); }catch (Exception e) { log.error("评分完成消息提醒发送消息异常:", e);