From ffd586b4b93665e1bf90df114e5eda71b47f20a8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Jun 2021 16:24:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
index 0507e7b..770af5c 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.configurations.RabbitMqConfig;
+import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.otc.dao.OtcMsgHistoryDao;
import com.xcong.excoin.modules.otc.dao.OtcMsgUserListDao;
import com.xcong.excoin.modules.otc.entity.OtcMsgHistoryEntity;
@@ -23,7 +24,7 @@
@Slf4j
@Component
-//@ConditionalOnProperty(prefix = "app", name = "rabbit-consumer", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "websocket-job", havingValue = "true")
public class ChatConsumer {
@Autowired
@@ -34,6 +35,9 @@
@Autowired
private RedisUtils redisUtils;
+
+ @Autowired
+ private MemberSettingDao memberSettingDao;
@RabbitListener(queues = RabbitMqConfig.QUEUE_MSG_HISTORY)
@Transactional(rollbackFor = Exception.class)
@@ -48,11 +52,14 @@
OtcMsgUserListEntity fromList = otcMsgUserListDao.selectChatListByToAndFrom(toId, fromId);
if (fromList == null) {
OtcMsgUserListEntity from = new OtcMsgUserListEntity();
- from.setMemberId(toId);
- from.setTargetId(fromId);
- from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
+ from.setMemberId(fromId);
+ from.setTargetId(toId);
+ from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
from.setLastMsgTime(new Date());
otcMsgUserListDao.insert(from);
+ } else {
+ fromList.setLastMsgTime(new Date());
+ otcMsgUserListDao.updateById(fromList);
}
// 收件人是否存在聊天框
@@ -61,7 +68,7 @@
OtcMsgUserListEntity from = new OtcMsgUserListEntity();
from.setMemberId(toId);
from.setTargetId(fromId);
- from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
+ from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
from.setLastMsgTime(new Date());
otcMsgUserListDao.insert(from);
} else {
@@ -91,6 +98,8 @@
fromHistory.setIsSelf(OtcMsgHistoryEntity.ISSELF_ONE);
fromHistory.setMemberId(fromId);
+ memberSettingDao.updateMessageReminderByMemberId(toId);
+
otcMsgHistoryDao.insert(fromHistory);
otcMsgHistoryDao.insert(toHistory);
}
--
Gitblit v1.9.1