|
|
@ -21,6 +21,8 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.collections4.CollectionUtils; |
|
|
|
import org.apache.kafka.clients.consumer.ConsumerRecord; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; |
|
|
|
import org.springframework.core.io.ClassPathResource; |
|
|
|
import org.springframework.kafka.annotation.KafkaListener; |
|
|
|
import org.springframework.kafka.support.Acknowledgment; |
|
|
|
import org.springframework.kafka.support.KafkaHeaders; |
|
|
@ -32,6 +34,7 @@ import java.time.LocalTime; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Optional; |
|
|
|
import java.util.Properties; |
|
|
|
|
|
|
|
@Component |
|
|
|
@Slf4j |
|
|
@ -123,9 +126,21 @@ public class KafkaConsumer { |
|
|
|
messageListService.saveOrUpdateDto(messageListDto); |
|
|
|
// 3、极光推送
|
|
|
|
// JPushServer.sendPushAlias("联系客户", MessageFormat.format("请联系 {0} 客户", vo.getName()), MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);
|
|
|
|
JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(), |
|
|
|
/*JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(), |
|
|
|
StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(), |
|
|
|
MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id); |
|
|
|
MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id);*/ |
|
|
|
YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean(); |
|
|
|
factoryBean.setResources(new ClassPathResource("application.yml")); |
|
|
|
Properties properties = factoryBean.getObject(); |
|
|
|
if ("pro".equals(properties.get("spring.profiles.active"))) { |
|
|
|
JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(), |
|
|
|
StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(), |
|
|
|
MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", id); |
|
|
|
}else{ |
|
|
|
JPushServer.sendPushAlias(kafkaMessage.getMsgTitle(), |
|
|
|
StringUtils.isBlank(vo.getRemind_remark()) ? kafkaMessage.getMsgContent() : kafkaMessage.getMsgContent(), |
|
|
|
MessageTypeEnum.CUSTOMER.getMsgTypeSid(), "客户", "T"+id); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|