shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SysPushServiceImpl.java
View File

@@ -19,7 +19,7 @@ import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.enums.systempush.*;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.mapper.SysPushMapper;
import com.ruoyi.cai.mq.AmqpProducer;
import com.ruoyi.cai.mq.AmqpHttpProducer;
import com.ruoyi.cai.mq.handle.dto.SysPushNotifyDTO;
import com.ruoyi.cai.mq.handleDelay.dto.SysPushDelayDto;
import com.ruoyi.cai.notice.data.NoticeMsgR;
@@ -67,7 +67,7 @@ public class SysPushServiceImpl extends ServiceImpl<SysPushMapper, SysPush> impl
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
@Autowired
private SysPushLogService sysPushLogService;
@@ -180,7 +180,7 @@ public class SysPushServiceImpl extends ServiceImpl<SysPushMapper, SysPush> impl
long between = CaiDateUtil.diff(sysPush.getSendTime(), LocalDateTime.now());
SysPushDelayDto dto = new SysPushDelayDto();
dto.setSysPushId(sysPush.getId());
amqpProducer.sendCommonDelayMq(dto,(int)between+2);
amqpHttpProducer.sendCommonDelayMq(dto,(int)between+2);
}catch (Exception e){
log.error("系统推送任务发送失败!",e);
}
@@ -210,7 +210,7 @@ public class SysPushServiceImpl extends ServiceImpl<SysPushMapper, SysPush> impl
}
SysPushNotifyDTO sysPush = new SysPushNotifyDTO();
sysPush.setSysPushId(id);
amqpProducer.sendCommonMq(sysPush);
amqpHttpProducer.sendCommonMq(sysPush);
}
@Override
@@ -413,7 +413,7 @@ public class SysPushServiceImpl extends ServiceImpl<SysPushMapper, SysPush> impl
if(between > 0 && between < 60*60*12){
SysPushDelayDto dto = new SysPushDelayDto();
dto.setSysPushId(sysPush.getId());
amqpProducer.sendCommonDelayMq(dto,(int)between+5);
amqpHttpProducer.sendCommonDelayMq(dto,(int)between+5);
}
}
}

11
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.ruoyi.cai.service.impl;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,18 +12,14 @@ import com.ruoyi.cai.enums.forbid.ForbidTimeEnum;
import com.ruoyi.cai.enums.forbid.ForbidTypeEnum;
import com.ruoyi.cai.manager.ForbidCache;
import com.ruoyi.cai.mapper.UserForbidMapper;
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.mq.handleDelay.dto.SysPushDelayDto;
import com.ruoyi.cai.service.AnchorService;
import com.ruoyi.cai.service.UserForbidService;
import com.ruoyi.cai.service.UserInfoService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.cai.util.CaiDateUtil;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
@@ -51,7 +46,7 @@ public class UserForbidServiceImpl extends ServiceImpl<UserForbidMapper, UserFor
@Autowired
private ForbidCache forbidCache;
@Autowired
private AmqpProducer amqpProducer;
private AmqpHttpProducer amqpHttpProducer;
@Autowired
private UserInfoService userInfoService;
@@ -100,7 +95,7 @@ public class UserForbidServiceImpl extends ServiceImpl<UserForbidMapper, UserFor
long between = CaiDateUtil.diff(one.getEndTime(), LocalDateTime.now());
ForbidDelayDto dto = new ForbidDelayDto();
dto.setForbidId(one.getId());
amqpProducer.sendCommonDelayMq(dto,(int)between+2);
amqpHttpProducer.sendCommonDelayMq(dto,(int)between+2);
}catch (Exception e){
log.error("用户封禁延时任务发送失败!",e);
}