|
@@ -4,10 +4,8 @@ import cn.com.ty.lift.common.model.PushMessage;
|
|
import cn.com.ty.lift.common.model.TimeMessage;
|
|
import cn.com.ty.lift.common.model.TimeMessage;
|
|
import cn.com.ty.lift.common.utils.ValuePool;
|
|
import cn.com.ty.lift.common.utils.ValuePool;
|
|
import cn.com.ty.lift.push.message.service.TimeMessageService;
|
|
import cn.com.ty.lift.push.message.service.TimeMessageService;
|
|
-import cn.com.ty.lift.push.message.service.UserAccountService;
|
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.springframework.data.redis.core.RedisTemplate;
|
|
|
|
import org.springframework.jms.annotation.JmsListener;
|
|
import org.springframework.jms.annotation.JmsListener;
|
|
import org.springframework.jms.core.JmsMessagingTemplate;
|
|
import org.springframework.jms.core.JmsMessagingTemplate;
|
|
import org.springframework.messaging.support.GenericMessage;
|
|
import org.springframework.messaging.support.GenericMessage;
|
|
@@ -15,6 +13,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -27,12 +26,10 @@ import java.util.List;
|
|
@Component
|
|
@Component
|
|
@AllArgsConstructor
|
|
@AllArgsConstructor
|
|
public class PushConsumer {
|
|
public class PushConsumer {
|
|
-
|
|
|
|
|
|
+ private static List<String> titles =
|
|
|
|
+ new ArrayList<>(Arrays.asList("公司公告", "团队消息", "年检消息", "保养消息", "急修消息", "提醒", "工作消息"));
|
|
private XingePush xingePush;
|
|
private XingePush xingePush;
|
|
private JmsMessagingTemplate jmsMessagingTemplate;
|
|
private JmsMessagingTemplate jmsMessagingTemplate;
|
|
- private TimeMessageService TimeMessageService;
|
|
|
|
- private RedisTemplate redisTemplate;
|
|
|
|
- private final UserAccountService userAccountService;
|
|
|
|
private final TimeMessageService timeMessageService;
|
|
private final TimeMessageService timeMessageService;
|
|
|
|
|
|
private class Processor {
|
|
private class Processor {
|
|
@@ -129,6 +126,9 @@ public class PushConsumer {
|
|
private void saveMessage(PushMessage pushMessage) {
|
|
private void saveMessage(PushMessage pushMessage) {
|
|
List<TimeMessage> timeMessages = new ArrayList<>();
|
|
List<TimeMessage> timeMessages = new ArrayList<>();
|
|
pushMessage.getUsers().forEach((k, v) -> {
|
|
pushMessage.getUsers().forEach((k, v) -> {
|
|
|
|
+ if (!titles.contains(pushMessage.getTitle())) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
TimeMessage timeMessage = new TimeMessage();
|
|
TimeMessage timeMessage = new TimeMessage();
|
|
timeMessage.setUserId(k);
|
|
timeMessage.setUserId(k);
|
|
timeMessage.setContent(pushMessage.getContent());
|
|
timeMessage.setContent(pushMessage.getContent());
|
|
@@ -143,6 +143,7 @@ public class PushConsumer {
|
|
case "急修消息":
|
|
case "急修消息":
|
|
timeMessage.setType(3);
|
|
timeMessage.setType(3);
|
|
break;
|
|
break;
|
|
|
|
+ case "年检消息":
|
|
case "提醒":
|
|
case "提醒":
|
|
case "工作消息":
|
|
case "工作消息":
|
|
timeMessage.setType(4);
|
|
timeMessage.setType(4);
|