czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
Tankaikai
2025-01-07 13:34:39 +08:00
parent 1ed411578f cf232586dc
commit e530955959
4 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sqx/common/utils/ApiAccessLimitUtil.java
View File

@@ -137,7 +137,7 @@ public class ApiAccessLimitUtil {
}
public static boolean getCertAuthIsAccessAllowed(String id, String key, Integer count) {
String redisKey = generateRedisKey(key, id);
String redisKey = "app:updateLimit:auth:" + key + ":" + id;
Object countObj = redisUtils.get(redisKey);
if (countObj == null) {
return true;
@@ -146,7 +146,7 @@ public class ApiAccessLimitUtil {
}
public static void setCertAuthIsAccessAllowed(String id, String key, Integer count, String timeFormat) {
String redisKey = generateRedisKey(key, id);
String redisKey = "app:updateLimit:auth:" + key + ":" + id;
Object countObj = redisUtils.get(redisKey);
if (countObj == null) {
long expireAt;

2
src/main/java/com/sqx/modules/app/dao/UserDao.java
View File

@@ -35,7 +35,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
int insertUser(UserEntity userEntity);
List<UserEntity> selectInviteUserList(String userName,String phone);
List<UserEntity> selectInviteUserList();
int selectUserOnLineCount(String qdCode);

22
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@@ -1523,19 +1523,31 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
@Override
public Result selectInviteUserList(Integer page, Integer limit, String userName, String phone) {
LambdaQueryWrapper<UserEntity> queryWrapper = new LambdaQueryWrapper<>();
if(StrUtil.isNotBlank(userName)) {
queryWrapper.like(UserEntity::getUserName, userName);
}
if (StrUtil.isNotBlank(phone)) {
queryWrapper.like(UserEntity::getPhone, phone);
}
queryWrapper.orderByDesc(UserEntity::getCreateTime);
PageHelper.startPage(page,limit);
List<UserEntity> userEntities = baseMapper.selectInviteUserList(userName, phone);
if (!userEntities.isEmpty()) {
Set<Long> userIdList = userEntities.stream().map(UserEntity::getUserId).collect(Collectors.toSet());
List<UserEntity> userEntityList = list(queryWrapper);
Map<Long, Integer> countInfoMap = baseMapper.selectInviteUserList().stream().collect(Collectors.toMap(UserEntity::getUserId, UserEntity::getCounts));
if (!userEntityList.isEmpty()) {
Set<Long> userIdList = userEntityList.stream().map(UserEntity::getUserId).collect(Collectors.toSet());
Map<Long, UserMoney> infoMap = userMoneyService.list(new LambdaQueryWrapper<UserMoney>()
.in(UserMoney::getUserId, userIdList))
.stream().collect(Collectors.toMap(UserMoney::getUserId, item -> item));
userEntities.forEach(item -> {
userEntityList.forEach(item -> {
UserMoney userMoney = infoMap.get(item.getUserId());
item.setMoney(userMoney == null ? BigDecimal.ZERO : userMoney.getInviteIncomeMoney());
item.setCounts(countInfoMap.get(item.getUserId()));
});
}
return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntities),true));
return Result.success().put("data", PageUtils.page(new PageInfo<>(userEntityList),true));
}
@Override