From 306a0ccfad3261986123b370160fcfaae7ba0df9 Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 19 Oct 2021 17:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbasics/service/EquipmentService.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/service/EquipmentService.java b/src/main/java/com/ccsens/carbasics/service/EquipmentService.java index b44e545..36b6b64 100644 --- a/src/main/java/com/ccsens/carbasics/service/EquipmentService.java +++ b/src/main/java/com/ccsens/carbasics/service/EquipmentService.java @@ -13,8 +13,13 @@ import com.ccsens.carbasics.persist.dao.FirstAidDao; import com.ccsens.carbasics.persist.dao.OrganizationMemberDao; import com.ccsens.carbasics.util.Constant; import com.ccsens.carbasics.util.DefaultCodeError; +import com.ccsens.common.service.IMessageService; import com.ccsens.util.CodeError; +import com.ccsens.util.bean.message.common.InMessage; +import com.ccsens.util.bean.message.common.MessageConstant; +import com.ccsens.util.bean.message.common.MessageRule; import com.ccsens.util.exception.BaseException; +import com.fasterxml.jackson.core.JsonProcessingException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -22,7 +27,9 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.validation.constraints.NotNull; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * @description: @@ -42,6 +49,8 @@ public class EquipmentService implements IEquipmentService { @Resource private QcpButtonReceive qcpButtonReceive; @Resource + private IMessageService messageService; + @Resource private OrganizationMemberDao organizationMemberDao; @@ -82,7 +91,7 @@ public class EquipmentService implements IEquipmentService { * 通知医院的所有成员病例进度 * @param firstAidId 病例 */ - private void sendDoctor(Long firstAidId, String firstAidName, Long organizationId){ + private void sendDoctor(Long firstAidId, String firstAidName, Long organizationId) throws Exception { // 查询医院所有成员 List userIds = organizationMemberDao.queryUserIdsByOrganizationId(organizationId); // 查询当前未完成的状态 @@ -91,7 +100,15 @@ public class EquipmentService implements IEquipmentService { if (inform == null) { return; } + Set userIdSet = new HashSet<>(); + userIds.forEach(userId -> userIdSet.add(userId + "")); // 封装对象 - + MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User); + messageRule.setAckRule(MessageRule.AckRule.NONE); + messageRule.setOfflineDiscard((byte) 1); + InMessage inMessage = InMessage.newToUserMessage(null, userIdSet, null, messageRule, ""); + log.info("发送消息:{}", inMessage); + //发送消息 + messageService.sendTo(inMessage); } }