This commit is contained in:
张良(004796)
2024-04-12 10:52:00 +08:00
parent fe413d0c99
commit 4d10fe5611
34 changed files with 246 additions and 212 deletions

View File

@@ -12,7 +12,7 @@ import com.ruoyi.cai.dto.commom.consumer.GuardConsumerResp;
import com.ruoyi.cai.dto.commom.consumer.RechargeConsumerResp;
import com.ruoyi.cai.dto.video.VideoSettleResp;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.AmqpHttpProducer;
import com.ruoyi.cai.mq.handle.dto.WindowGiftNotifyDTO;
import com.ruoyi.cai.mq.handle.dto.WindowRechargeNotifyDTO;
import com.ruoyi.cai.notice.YunxinHttpService;
@@ -37,7 +37,7 @@ public class ConsumerManager {
@Autowired
private UserGiftService userGiftService;
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
@Autowired
private RechargeOrderService rechargeOrderService;
@Autowired
@@ -57,7 +57,7 @@ public class ConsumerManager {
GuardConsumerResp resp = guardTotalService.giveGuard(query);
if(resp.isSuccess()){
try {
amqpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
}catch (Exception e){
log.error("RabbitMq 发送失败, 守护分销流程流转失败!",e);
}
@@ -79,7 +79,7 @@ public class ConsumerManager {
GiftConsumerResp resp = userGiftService.giveGift(query);
if(resp.isSuccess()){
try {
amqpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
}catch (Exception e){
log.error("RabbitMq 发送失败, 礼物分销流程流转失败!",e);
}
@@ -107,7 +107,7 @@ public class ConsumerManager {
windowGift.setToId(resp.getToUid());
windowGift.setGift(resp.getGift());
windowGift.setGiftNum(query.getGiftCount());
amqpProducer.sendWindowMq(windowGift);
amqpHttpProducer.sendWindowMq(windowGift);
}
}
}catch (Exception e){
@@ -121,7 +121,7 @@ public class ConsumerManager {
VideoSettleResp resp = accountService.videoSettle(room);
ConsumeLog consumeLog = resp.getConsumeLog();
try {
amqpProducer.sendCalculateSales(consumeLog.getId()+"");
amqpHttpProducer.sendCalculateSales(consumeLog.getId()+"");
}catch (Exception e){
log.error("RabbitMq 发送失败, 视频分销流程流转失败!",e);
}
@@ -152,7 +152,7 @@ public class ConsumerManager {
log.error("充值每日实时统计失败",e);
}
try {
amqpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
amqpHttpProducer.sendCalculateSales(resp.getConsumeLogId()+"");
}catch (Exception e){
log.error("RabbitMq 发送失败, 充值分销流程流转失败!",e);
}
@@ -176,7 +176,7 @@ public class ConsumerManager {
windowRecharge.setAvatar(resp.getUser().getAvatar());
windowRecharge.setAmount(resp.getRechargeCoin());
windowRecharge.setTime(LocalDateTime.now());
amqpProducer.sendWindowMq(windowRecharge);
amqpHttpProducer.sendWindowMq(windowRecharge);
}
}
}catch (Exception e){

View File

@@ -2,20 +2,17 @@ package com.ruoyi.cai.manager;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.constant.RedisHttpConstant;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.dto.admin.vo.AnchorTopAdminVo;
import com.ruoyi.cai.dto.app.query.index.AnchorListQuery;
import com.ruoyi.cai.dto.app.vo.AnchorListVo;
import com.ruoyi.cai.dto.app.vo.setting.AppHomeConfig;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.enums.home.AnchorListQueryTypeEnum;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.AmqpHttpProducer;
import com.ruoyi.cai.mq.handle.dto.LoginNotifyDTO;
import com.ruoyi.cai.service.AnchorService;
import com.ruoyi.cai.service.AnchorTopService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import org.apache.commons.collections4.CollectionUtils;
@@ -24,7 +21,6 @@ import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -147,7 +143,7 @@ public class HomeManager {
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
public AppHomeConfig config() {
AppHomeConfig config = new AppHomeConfig();
@@ -160,7 +156,7 @@ public class HomeManager {
loginUserDTO.setUserId(userId);
loginUserDTO.setImei(ServletUtils.getImei());
loginUserDTO.setClientIP(ServletUtils.getClientIP());
amqpProducer.sendCommonMq(loginUserDTO);
amqpHttpProducer.sendCommonMq(loginUserDTO);
}
return config;
}

View File

@@ -15,7 +15,7 @@ import com.ruoyi.cai.enums.ChatTypeEnum;
import com.ruoyi.cai.enums.GenderEnum;
import com.ruoyi.cai.enums.UserMemberTypeEnum;
import com.ruoyi.cai.enums.im.ImImgStatusEnum;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.AmqpHttpProducer;
import com.ruoyi.cai.mq.handleDelay.dto.SaveSendImImgDelayDto;
import com.ruoyi.cai.service.*;
import com.ruoyi.cai.util.FileUtils;
@@ -50,7 +50,7 @@ public class ImService {
@Autowired
private UserBlacklistService userBlacklistService;
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
@Autowired
private ISysOssService sysOssService;
@Autowired
@@ -229,7 +229,7 @@ public class ImService {
}
SaveSendImImgDelayDto dto = new SaveSendImImgDelayDto();
dto.setRecordId(saveSendImImgReq.getRecordId());
amqpProducer.sendCommonDelayMq(dto,5);
amqpHttpProducer.sendCommonDelayMq(dto,5);
}

View File

@@ -10,14 +10,11 @@ import com.ruoyi.cai.dto.admin.query.UserForbidReq;
import com.ruoyi.cai.enums.ForbidStatusEnum;
import com.ruoyi.cai.enums.forbid.ForbidTimeEnum;
import com.ruoyi.cai.enums.forbid.ForbidTypeEnum;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.CommonDelayTypeEnum;
import com.ruoyi.cai.mq.handleDelay.CommonDelayDto;
import com.ruoyi.cai.mq.AmqpHttpProducer;
import com.ruoyi.cai.mq.handleDelay.dto.ForbidDelayDto;
import com.ruoyi.cai.service.*;
import com.ruoyi.cai.util.CaiDateUtil;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import lombok.Data;
@@ -277,13 +274,13 @@ public class UserForbidManager {
if(between > 0 && between < 60*60*12){
ForbidDelayDto dto = new ForbidDelayDto();
dto.setForbidId(expireId);
amqpProducer.sendCommonDelayMq(dto,(int)between+5);
amqpHttpProducer.sendCommonDelayMq(dto,(int)between+5);
}
}
}
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
public void checkExpire(Long id){
UserForbid userForbid = userForbidService.getById(id);