Commit b8817df0 b8817df08220623cc38545b47cb081d828e1fc93 by xianghan

1.update

1 parent b5fbd670
......@@ -31,11 +31,11 @@ public class UcEngineIptv2ManagementConsumer {
* @author Hongyan Wang
* @date 2021/9/7 11:26 上午
*/
/* @RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.ENGINE_TO_MANAGEMENT_DIRECT),
exchange = @Exchange(value = ExchangeTypes.DIRECT))
}, containerFactory = "managementRabbitListenerContainerFactory")*/
}, containerFactory = "serviceRabbitListenerContainerFactory")*/
public void ucEventConsumer(String content) {
log.info(" receive dataSync msg , content is : {} ", content);
TableOperationMsg tableOperationMsg = this.parseContent(content);
......
......@@ -100,6 +100,9 @@ public class UcEventBusIptv2ManagementUcEngine {
dataSyncMsg.setEventType(evt);
DataSyncMsg.MsgData msgData1 = new DataSyncMsg.MsgData();
Integer playDurationValueTotal = 0;
if (StringUtils.isNotBlank(platformAccount)) {
UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
......@@ -110,17 +113,17 @@ public class UcEventBusIptv2ManagementUcEngine {
Map<Object, Object> hmget =
this.redisUtils.hmget(key);
Integer playDurationValueTotal = 0;
int maxSize = 1;
if (MapUtils.isNotEmpty(hmget)) {
Set<Object> objects = hmget.keySet();
for (Object key_ : objects) {
if (Objects.nonNull(key_)) {
Integer playDurationValueTotal_ = 0;
for (Object key_ : objects) {
if (key_.toString().equalsIgnoreCase("total")) {
Integer playDurationValueTotal_ = Integer.valueOf(hmget.get(key_).toString());
if (playDurationValueTotal_ >= 30) {
playDurationValueTotal_ = Integer.valueOf(hmget.get(key_).toString());
if (playDurationValueTotal_ > 1440) {
maxSize = objects.size();
Integer maxTotal = maxSize+1;
Integer playDurationValue = Integer.valueOf(hmget.get(key_).toString());
......@@ -133,21 +136,20 @@ public class UcEventBusIptv2ManagementUcEngine {
}
}
}
maxSize = objects.size();
Integer playDurationValue = Integer.valueOf(hmget.get("total").toString());
playDurationValueTotal = playDurationValue+playDuration;
playDurationValueTotal = playDurationValueTotal_ + playDuration;
Map<String, Object> map = new HashMap<>();
map.put(String.valueOf(maxSize+1), playDuration);
map.put("total", playDurationValueTotal);
this.redisUtils.hmset(key, map, 172800);
}
}
} else {
playDurationValueTotal = playDuration;
Map<String, Object> map = new HashMap<>();
map.put("total", playDurationValueTotal);
......@@ -157,13 +159,45 @@ public class UcEventBusIptv2ManagementUcEngine {
}
DataSyncMsg dataSyncMsg1 = null;
if (playDurationValueTotal >= PLAY_30) {
if (playDurationValueTotal > 0 && playDurationValueTotal <= PLAY_30) {
log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
log.info("===>> start dealTask");
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
dataSyncMsg, msgData1, userTvDTO);
}
if (playDurationValueTotal >= 31 && playDurationValueTotal <= 60) {
log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
log.info("===>> start dealTask");
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDuration,
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 30,
dataSyncMsg, msgData1, userTvDTO);
this.taskDeal(dataSyncMsg1);
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
dataSyncMsg, msgData1, userTvDTO);
}
if (playDurationValueTotal >= 61 && playDurationValueTotal <= 1440) {
log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
log.info("===>> start dealTask");
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 30,
dataSyncMsg, msgData1, userTvDTO);
this.taskDeal(dataSyncMsg1);
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, 60,
dataSyncMsg, msgData1, userTvDTO);
this.taskDeal(dataSyncMsg1);
dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
dataSyncMsg, msgData1, userTvDTO);
}
log.info("playDurationValueTotal ===>>> {}",playDurationValueTotal);
log.info("===>> start dealTask");
/*dataSyncMsg1 = getDataSyncMsg(time, deviceType, mediaCode, mediaId, mediaName, playDurationValueTotal,
dataSyncMsg, msgData1, userTvDTO);*/
return dataSyncMsg1;
}
......@@ -180,7 +214,8 @@ public class UcEventBusIptv2ManagementUcEngine {
return null;
}
private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName, Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) {
private DataSyncMsg getDataSyncMsg(String time, Integer deviceType, String mediaCode, Long mediaId, String mediaName,
Integer playDuration, DataSyncMsg dataSyncMsg, DataSyncMsg.MsgData msgData1, UserTvDTO userTvDTO) {
String priorityMemberCode = userTvDTO.getPriorityMemberCode();
log.info("priorityMemberCode ==>> {}", priorityMemberCode);
String memberCode = "";
......