Commit 0e01f9ee 0e01f9eecf5a4295b1a173c529f661a1a172ec39 by xianghan

1.优化

1 parent e4f79b38
......@@ -54,7 +54,7 @@ public class UserTvServiceImpl implements UserTvService {
// 主账号会员code
String priorityMemberCode = userTvDTO.getPriorityMemberCode();
if (StringUtils.isNotBlank(platformAccount))
if (StringUtils.isNotBlank(priorityMemberCode))
return this.findMemberByMemberCode(priorityMemberCode);
else
return this.findMemberByMemberId(userTvDTO.getMemberId());
......
package com.topdraw.mq.consumer;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.topdraw.business.module.member.service.dto.MemberDTO;
import com.topdraw.business.module.user.iptv.service.UserTvService;
import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
import com.topdraw.config.RabbitMqConfig;
import com.topdraw.mq.domain.DataSyncMsg;
import com.topdraw.resttemplate.RestTemplateClient;
import com.topdraw.util.JSONUtil;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.rabbit.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -15,6 +20,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import java.sql.Timestamp;
import java.util.Objects;
@Component
@Slf4j
......@@ -22,9 +28,8 @@ public class UcEventBusConsumer {
@Autowired
RestTemplateClient restTemplateClient;
@Autowired
AutoRoute autoUser;
private UserTvService userTvService;
/**
* 事件
......@@ -43,7 +48,7 @@ public class UcEventBusConsumer {
public void ucEventConsumer(String content) {
log.info(" receive dataSync msg , content is : {} ", content);
DataSyncMsg dataSyncMsg = this.parseContent(content);
// this.taskDeal(dataSyncMsg);
this.taskDeal(dataSyncMsg);
log.info("ucEventConsumer ====>>>> end");
}
......@@ -73,16 +78,51 @@ public class UcEventBusConsumer {
case "PLAY":
PlayContent playContent = JSONUtil.parseMsg2Object(content, PlayContent.class);
PlayContent.MsgData msgData = playContent.getMsgData();
if (Objects.nonNull(msgData)) {
String time = playContent.getTime();
Integer deviceType = playContent.getDeviceType();
String platformAccount = msgData.getPlatformAccount();
String mediaCode = msgData.getMediaCode();
Long mediaId = msgData.getMediaId();
String mediaName = msgData.getMediaName();
Integer playDuration = msgData.getPlayDuration();
DataSyncMsg dataSyncMsg = new DataSyncMsg();
dataSyncMsg.setEventType(evt);
DataSyncMsg.MsgData msgData1 = new DataSyncMsg.MsgData();
if (StringUtils.isNotBlank(platformAccount)) {
MemberDTO memberDTO = this.userTvService.findMemberByPlatformAccount(platformAccount);
Long memberId = memberDTO.getId();
String memberCode = memberDTO.getCode();
msgData1.setMemberCode(memberCode);
}
msgData1.setEvent(8);
msgData1.setDeviceType(deviceType);
msgData1.setMediaId(mediaId);
JSONObject jsonObject = new JSONObject();
jsonObject.put("mediaId", mediaId);
jsonObject.put("mediaName", mediaName);
jsonObject.put("playDuration", playDuration);
jsonObject.put("mediaCode", mediaCode);
jsonObject.put("time", time);
msgData1.setDescription(JSON.toJSONString(jsonObject));
dataSyncMsg.setMsg(msgData1);
return dataSyncMsg;
}
System.out.println(playContent);
break;
}
DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content,DataSyncMsg.class);
Assert.notNull(dataSyncMsg,"ERROR -->> operationConsumer -->> parseContent -->> 【dataSyncMsg】 not be null !!");
DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
Assert.notNull(msgData,"ERROR -->> operationConsumer -->> parseContent -->> 【msgData】 not be null !!");
return dataSyncMsg;
return null;
}
/**
......