|
@@ -4,13 +4,12 @@ import cn.com.ty.lift.common.constants.WebSocketConstants;
|
|
|
import cn.com.ty.lift.common.model.PushMessage;
|
|
|
import cn.com.ty.lift.common.model.TimeMessage;
|
|
|
import cn.com.ty.lift.common.utils.ValuePool;
|
|
|
-import cn.com.ty.lift.push.message.dao.entity.UserAccount;
|
|
|
import cn.com.ty.lift.push.message.service.TimeMessageService;
|
|
|
import cn.com.ty.lift.push.message.service.UserAccountService;
|
|
|
import cn.com.ty.lift.push.websocket.handler.TimeyMessageHandler;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.jms.annotation.JmsListener;
|
|
|
import org.springframework.jms.core.JmsMessagingTemplate;
|
|
|
import org.springframework.messaging.support.GenericMessage;
|
|
@@ -18,7 +17,6 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
-import java.util.Hashtable;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -35,6 +33,7 @@ public class PushConsumer {
|
|
|
private XingePush xingePush;
|
|
|
private JmsMessagingTemplate jmsMessagingTemplate;
|
|
|
private TimeMessageService TimeMessageService;
|
|
|
+ private RedisTemplate redisTemplate;
|
|
|
private final UserAccountService userAccountService;
|
|
|
private final TimeMessageService timeMessageService;
|
|
|
|
|
@@ -127,7 +126,7 @@ public class PushConsumer {
|
|
|
@JmsListener(destination = WebSocketConstants.PUSH_MESSAGE_TO_PC)
|
|
|
public void listenPCAllQueue(List<TimeMessage> timeMessageList) {
|
|
|
log.info("listen {} receive message: {}", WebSocketConstants.PUSH_MESSAGE_TO_PC, timeMessageList);
|
|
|
- TimeyMessageHandler timeMessageHandler = new TimeyMessageHandler(TimeMessageService);
|
|
|
+ TimeyMessageHandler timeMessageHandler = new TimeyMessageHandler(TimeMessageService, redisTemplate);
|
|
|
timeMessageHandler.saveAndPushMessageToUsers(timeMessageList);
|
|
|
}
|
|
|
|