diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java index a6f0bda..31b7522 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java @@ -17,6 +17,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -47,6 +48,7 @@ public class ChatTask { // @Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 15 1 * * ?") + @Transactional public void chatMessageDataSeparatedForHotAndCold(){ if(!enable){ System.out.println("ChatTask 定时任务已关闭,请在nacos修改配置"); diff --git a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml index 247be6c..78f2ce8 100644 --- a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml +++ b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml @@ -37,8 +37,9 @@ select room_id from chat_message where send_email = #{userEmail} group by room_id UNION select room_id from chat_message_history where send_email = #{userEmail} group by room_id - UNION - select id as room_id from chat_room where user_two_email = #{userEmail} +-- 不再展示不存在聊天信息的聊天室 +-- UNION +-- select id as room_id from chat_room where user_two_email = #{userEmail}