From 33a67c477889154f1839f05f185834e49881017f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 3 Jan 2019 21:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/mq/I3CoreQueueConfig.java | 5 -- .../core/apiservice/mq/MailQueueReceiver.java | 99 ---------------------- 2 files changed, 104 deletions(-) delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java index d411e9a..9498b4f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java @@ -30,7 +30,6 @@ public class I3CoreQueueConfig { /*********** 队列demo ***********/ public static final String DEMO_STR_QUEUE = "demo_str_queue"; - @Bean public Queue getStrQueue() { //LOGGER.info("【DEMO_STR_QUEUE队列】"); @@ -38,7 +37,6 @@ public class I3CoreQueueConfig { } public static final String DEMO_OBJ_QUEUE = "demo_obj_queue"; - @Bean public Queue getObjQueue() throws Exception { //LOGGER.info("【DEMO_OBJ_QUEUE队列】"); @@ -46,7 +44,6 @@ public class I3CoreQueueConfig { } public static final String DEMO_HANDLE_QUEUE = "demo_handle_queue"; - @Bean public Queue getHandleQueue() throws Exception { //LOGGER.info("【DEMO_HANDLE_QUEUE队列】"); @@ -54,7 +51,6 @@ public class I3CoreQueueConfig { } public static final String DEMO_ACK_QUEUE = "ack_queue"; - @Bean public Queue getAckQueue() throws Exception { //LOGGER.info("【DEMO_ACK_QUEUE队列】"); @@ -62,7 +58,6 @@ public class I3CoreQueueConfig { } public static final String DEMO_RETURN_QUEUE = "return_queue"; - @Bean public Queue getReturnQueue() throws Exception { //LOGGER.info("【DEMO_RETURN_QUEUE队列】"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java deleted file mode 100644 index a4f5ff9..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java +++ /dev/null @@ -1,99 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.mq; - -import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; -import cn.estsh.i3plus.core.apiservice.util.MailUtil; -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import com.rabbitmq.client.Channel; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.IOException; - -/** - * @Description : 邮件队列处理 - * @Reference : - * @Author : yunhao - * @CreateDate : 2018-11-15 22:15 - * @Modify: - **/ -@Component -public class MailQueueReceiver { - private static final Logger LOGGER = LoggerFactory.getLogger(MailQueueReceiver.class); - - @Autowired - ISysMessageService sysMessageService; - @Autowired - ISysUserService sysUserService; - @Autowired - MailUtil mailUtil; - /** - * 系统邮件处理队列 - * @param msg - * @param channel - * @param message - */ - @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE) - public void processImppMail(SysMessage msg, Channel channel, Message message) { - try { - LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);msg = sysMessageService.insertSysMessage(msg); - mailUtil.init(); - - // 收件人信息 - String[] messageReceiver = msg.getMessageReceiversId().split(","); - String[] receiverName = new String[messageReceiver.length]; - - SysRefUserMessage refUserMessage; - SysUser sysUser; - - for (int i = 0; i < messageReceiver.length; i++) { - sysUser = sysUserService.getSysUserById(Long.parseLong(messageReceiver[i])); - receiverName[i] = sysUser.getUserName(); - - refUserMessage = new SysRefUserMessage(); - refUserMessage.setMessageId(msg.getId()); - refUserMessage.setMessageTitleRdd(msg.getMessageTitle()); - refUserMessage.setMessageTypeRdd(msg.getMessageType()); - refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd()); - refUserMessage.setReceiverId(sysUser.getId()); - refUserMessage.setReceiverNameRdd(sysUser.getUserName()); - refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); - refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); - - sysMessageService.insertSysRefUserMessage(refUserMessage); - - // 发送邮件 - mailUtil.setSubject(msg.getMessageTitle()); - mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType())); - mailUtil.setBody(msg.getMessageContent()); - mailUtil.setTo(sysUser.getUserEmail()); - mailUtil.send(); - } - - msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); - sysMessageService.updateSysMessage(msg); - - //信息已处理 - channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); - } catch (IOException e) { - LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}",e.getMessage(),e); - //丢弃这条消息 - try { - // 未成功处理，重新发送 - channel.basicNack(message.getMessageProperties().getDeliveryTag(),false,true); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } -}