From e2a03924a98600e68f5a7979e00d1830a6d198c9 Mon Sep 17 00:00:00 2001 From: 777 <123@qwe.com> Date: Fri, 26 Sep 2025 15:40:59 +0800 Subject: [PATCH] V13 --- doc/20250926.sql | 19 ++++ .../controller/cai/app/IndexController.java | 10 +- .../controller/cai/app/RankAppController.java | 37 ++++++++ .../com/ruoyi/cai/domain/LoveRankToday.java | 55 +++++++++++ .../cai/dto/app/vo/rank/RankNodeRecharge.java | 22 +++++ .../ruoyi/cai/enums/rank/RankTypeEnum.java | 1 + .../ruoyi/cai/manager/ConsumerManager.java | 2 +- .../com/ruoyi/cai/mapper/AccountMapper.java | 5 + .../ruoyi/cai/mapper/LoveRankTodayMapper.java | 17 ++++ .../ruoyi/cai/mq/handle/RankNotifyHandle.java | 8 ++ .../ruoyi/cai/notice/YunxinHttpService.java | 27 +++++- .../cai/service/LoveRankTodayService.java | 16 ++++ .../impl/LoveRankTodayServiceImpl.java | 93 +++++++++++++++++++ .../com/ruoyi/cai/util/IdLockManager.java | 38 ++++++++ .../ruoyi/cai/ws/constant/RedisConstant.java | 1 + .../resources/mapper/cai/AccountMapper.xml | 12 ++- .../mapper/cai/LoveRankTodayMapper.xml | 32 +++++++ 17 files changed, 391 insertions(+), 4 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LoveRankToday.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/rank/RankNodeRecharge.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LoveRankTodayMapper.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/LoveRankTodayService.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LoveRankTodayServiceImpl.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/util/IdLockManager.java create mode 100644 ruoyi-cai/src/main/resources/mapper/cai/LoveRankTodayMapper.xml diff --git a/doc/20250926.sql b/doc/20250926.sql index deedb917..198febf5 100644 --- a/doc/20250926.sql +++ b/doc/20250926.sql @@ -1,2 +1,21 @@ ALTER TABLE cai_anchor ADD COLUMN `anchor_total_coin` bigint(20) default 0 COMMENT '主播总收入'; + +CREATE TABLE `cai_love_rank_today` +( + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `data_type` tinyint NOT NULL default 2 COMMENT '日期类型 1-日榜 2-周榜 3-月榜', + `rank_time` date not null comment '榜单期数', + `begin_rank_time` date null comment '开始时间', + `end_rank_time` date null comment '结束时间', + `num` bigint(20) NOT NULL DEFAULT 0 COMMENT '数值', + `user_id` bigint(20) not null comment '用户ID', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE, + INDEX `idx_date` (`rank_time`, `num`) USING BTREE, + INDEX `idx_user_id` (`user_id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci + ROW_FORMAT = DYNAMIC COMMENT ='魅力榜单实时数据'; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java index b5916afa..9a396c9e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java @@ -15,6 +15,7 @@ import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import com.ruoyi.cai.dto.app.vo.user.UserMinInfoVo; import com.ruoyi.cai.enums.SystemConfigEnum; +import com.ruoyi.cai.enums.home.AnchorListQueryTypeEnum; import com.ruoyi.cai.manager.HomeManager; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.service.*; @@ -53,6 +54,8 @@ public class IndexController { private HomeManager homeManager; @Autowired private SystemConfigManager systemConfigManager; + @Autowired + private LoveRankTodayService loveRankTodayService; @GetMapping("/config") @Operation(summary = "获取APP系统核心参数") @@ -103,7 +106,12 @@ public class IndexController { @Operation(summary = "首页查询主播接口-分页") @Log(title = "首页查询主播接口V2", businessType = BusinessType.OTHER,isPrintResponseData = false, isSaveDb = false) public R> anchorPageV2(PageQuery page, AnchorListQuery query){ - List home = homeManager.getHomeV2(page, query); + List home; + if(AnchorListQueryTypeEnum.LOVE.getCode().equals(query.getType())){ + home = loveRankTodayService.homePage(page, query); + }else{ + home = homeManager.getHomeV2(page, query); + } home.forEach(i -> { if(i.getServiceTime() != null){ i.setServiceTime(i.getServiceTime()/60); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java index a4c04c41..bcece63b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/RankAppController.java @@ -5,11 +5,13 @@ import com.ruoyi.cai.dto.app.RankIdReq; import com.ruoyi.cai.dto.app.vo.anchor.AnchorStatusDTO; import com.ruoyi.cai.dto.app.vo.rank.RankNodeInvite; import com.ruoyi.cai.dto.app.vo.rank.RankNodeLove; +import com.ruoyi.cai.dto.app.vo.rank.RankNodeRecharge; import com.ruoyi.cai.dto.app.vo.rank.RankRemark; import com.ruoyi.cai.enums.GenderEnum; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.manager.AwardManager; import com.ruoyi.cai.manager.SystemConfigManager; +import com.ruoyi.cai.mapper.AccountMapper; import com.ruoyi.cai.mapper.AnchorMapper; import com.ruoyi.cai.rank.RankManager; import com.ruoyi.cai.rank.RankNode; @@ -31,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -81,6 +84,40 @@ public class RankAppController { return R.ok(); } + + @Resource + private AccountMapper accountMapper; + + @GetMapping("/recharge") + @Operation(summary = "土豪榜") + @Log(title = "土豪榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) + public R> rechargeRank( + @Parameter(description = "类型 1-上周 2-昨日 3-日榜 4-周榜 5-月榜 6-总榜") Integer type){ + if(type == null){ + return R.ok(Collections.emptyList()); + } + Long userId = LoginHelper.getUserId(); + long lastLove = 0; + List rankNodeList = accountMapper.rankTotalPay(30); + for (int i = 0; i < rankNodeList.size(); i++) { + RankNodeRecharge rankNodeRecharge = rankNodeList.get(i); + rankNodeRecharge.setValue(rankNodeRecharge.getMoney().longValue()); + if(!rankNodeRecharge.getUserId().equals(userId)){ + rankNodeRecharge.setAvatar(GenderEnum.WOMEN.getDefaultAvatar()); + rankNodeRecharge.setNickname(minNickname(rankNodeRecharge.getNickname())); + rankNodeRecharge.setUserId(null); + } + if(i == 0){ + rankNodeRecharge.setDiffLastValue(0L); + }else{ + rankNodeRecharge.setDiffLastValue(lastLove - rankNodeRecharge.getValue()); + } + } + return R.ok(rankNodeList); + } + + + @GetMapping("/love") @Operation(summary = "魅力榜") @Log(title = "魅力榜单查询", businessType = BusinessType.OTHER, isPrintResponseData = true, isSaveDb = false) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LoveRankToday.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LoveRankToday.java new file mode 100644 index 00000000..5fbcc67f --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/LoveRankToday.java @@ -0,0 +1,55 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 魅力榜单实时数据 + */ +@Data +@TableName("cai_love_rank_today") +public class LoveRankToday implements Serializable { + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 日期类型 1-日榜 2-周榜 3-月榜 + */ + private Integer dataType; + + /** + * 榜单期数 + */ + private LocalDate rankTime; + + /** + * 开始时间 + */ + private LocalDate beginRankTime; + + /** + * 结束时间 + */ + private LocalDate endRankTime; + + /** + * 数值 + */ + private Long num; + + /** + * 用户ID + */ + private Long userId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/rank/RankNodeRecharge.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/rank/RankNodeRecharge.java new file mode 100644 index 00000000..1ac2fd03 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/rank/RankNodeRecharge.java @@ -0,0 +1,22 @@ +package com.ruoyi.cai.dto.app.vo.rank; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class RankNodeRecharge { + + @Schema(description = "用户ID，只有当前用户才有数据，其他用户因为保密问题没有") + private Long userId; + @Schema(description = "头像") + private String avatar; + @Schema(description = "昵称") + private String nickname; + private BigDecimal money; + @Schema(description = "数值") + private Long value; + @Schema(description = "距离上一名差距") + private Long diffLastValue; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/rank/RankTypeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/rank/RankTypeEnum.java index 854232f4..12b7de53 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/rank/RankTypeEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/rank/RankTypeEnum.java @@ -7,6 +7,7 @@ import lombok.Getter; public enum RankTypeEnum { LOVE(1,"魅力榜"), INVITE(2,"邀请榜"), + PAY(3,"土豪榜"), ; private final Integer code; private final String text; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java index 4ef10ce8..8dad47d2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/ConsumerManager.java @@ -183,7 +183,7 @@ public class ConsumerManager { accountTotalManager.incsTrdPayIncomeCoin(resp.getUserId(), resp.getPrice()); } }catch (Exception e){ - log.error("主播消费记录失败-充值",e); + log.error("用户充值记录失败-充值",e); } try { Account account = accountService.getByUserId(resp.getUserId()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java index 6aba8738..ccba2aea 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/AccountMapper.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.Account; import com.ruoyi.cai.dto.admin.vo.AccountAdminVo; +import com.ruoyi.cai.dto.app.vo.rank.RankNodeRecharge; +import com.ruoyi.cai.rank.RankNode; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; +import java.util.List; /** * 用户账户Mapper接口 @@ -38,4 +41,6 @@ public interface AccountMapper extends BaseMapper { void incsPayTotal(@Param("userId") Long userId, @Param("rechargeCoin") Long rechargeCoin, @Param("price") BigDecimal price); void incsTrdPayTotal(@Param("userId") Long userId, @Param("price") BigDecimal price); + + List rankTotalPay(@Param("limit") int limit); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LoveRankTodayMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LoveRankTodayMapper.java new file mode 100644 index 00000000..811b8a75 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/LoveRankTodayMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.LoveRankToday; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; +import com.ruoyi.cai.dto.app.vo.AnchorListVo; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; + +public interface LoveRankTodayMapper extends BaseMapper { + + void insRank(@Param("id") Long id, @Param("value") Long value); + + Page homePage(Page build, @Param("query") AnchorListQuery query, @Param("monday") LocalDate monday); +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/RankNotifyHandle.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/RankNotifyHandle.java index 5341769c..af8f30a7 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/RankNotifyHandle.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/RankNotifyHandle.java @@ -1,9 +1,12 @@ package com.ruoyi.cai.mq.handle; import com.alibaba.fastjson2.JSON; +import com.ruoyi.cai.enums.rank.RankDataTypeEnum; +import com.ruoyi.cai.enums.rank.RankTypeEnum; import com.ruoyi.cai.mq.CommonConsumerEnum; import com.ruoyi.cai.mq.handle.dto.RankNotifyDTO; import com.ruoyi.cai.rank.RankManager; +import com.ruoyi.cai.service.LoveRankTodayService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -14,10 +17,15 @@ public class RankNotifyHandle implements IHandle { @Autowired private RankManager rankManager; + @Autowired + private LoveRankTodayService loveRankTodayService; @Override public void run(String message) { RankNotifyDTO rank = JSON.parseObject(message, RankNotifyDTO.class); rankManager.addRank(rank); + if(RankTypeEnum.LOVE.getCode().equals(rank.getRankType())){ + loveRankTodayService.addRank(rank); + } } @Override diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java index 04871b46..87abf529 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java @@ -14,12 +14,14 @@ import com.ruoyi.cai.service.AccountService; import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.cai.util.CaiNumUtil; +import com.ruoyi.cai.ws.constant.RedisConstant; import com.ruoyi.yunxin.YunExecutor; import com.ruoyi.yunxin.Yunxin; import com.ruoyi.yunxin.resp.SendMsgResp; import com.ruoyi.yunxin.resp.YxCommonR; import com.ruoyi.yunxin.resp.YxDataR; import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -43,6 +45,8 @@ public class YunxinHttpService { private CaiProperties caiProperties; @Autowired private UserService userService; + @Autowired + private RedissonClient redissonClient; /** * 注册赠送消息 @@ -247,14 +251,34 @@ public class YunxinHttpService { }); } + + private boolean checkFollowedSendMessage(Long toUid, + User followUser){ + String key = String.format(RedisConstant.START_SEND_MESSAGE_CACHE, toUid); + Object o = redissonClient.getMap(key).get(followUser.getId()); + return o != null; + } + + private void setFollowedSendMessage(Long toUid,User followUser){ + String key = String.format(RedisConstant.START_SEND_MESSAGE_CACHE, toUid); + redissonClient.getMap(key).put(followUser.getId(),1); + } + /** * 关注发送消息 - * @param toUid + * @param toUid 接收消息的用户 */ public void followedSendMessage(Long toUid, User followUser, LocalDateTime followTime){ YunExecutor.YUN_EXECUTOR.execute(() -> { + // 检测是否发送过通知 + boolean checked = checkFollowedSendMessage(toUid, followUser); + if(checked){ + log.error("用户已经发送过关注通知，无需再次发送 被关注人id:{}, 关注人id：{} 昵称:{} 编号:{}", + toUid, followUser.getId(), followUser.getNickname(),followUser.getUsercode()); + return; + } SendFollowNoticeData data = new SendFollowNoticeData(); data.setUserid(followUser.getId()); data.setNickname(followUser.getNickname()); @@ -268,6 +292,7 @@ public class YunxinHttpService { if(r == null || !r.isSuccess()){ log.error("云信发送失败【sendCallAsync】r={}", JSON.toJSONString(r)); } + this.setFollowedSendMessage(toUid, followUser); }); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/LoveRankTodayService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/LoveRankTodayService.java new file mode 100644 index 00000000..a06fbd43 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/LoveRankTodayService.java @@ -0,0 +1,16 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.LoveRankToday; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; +import com.ruoyi.cai.dto.app.vo.AnchorListVo; +import com.ruoyi.cai.mq.handle.dto.RankNotifyDTO; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.List; + +public interface LoveRankTodayService extends IService { + List homePage(PageQuery pageQuery, AnchorListQuery query); + + void addRank(RankNotifyDTO rank); +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LoveRankTodayServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LoveRankTodayServiceImpl.java new file mode 100644 index 00000000..884888c3 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/LoveRankTodayServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.Anchor; +import com.ruoyi.cai.domain.LoveRankToday; +import com.ruoyi.cai.dto.app.query.index.AnchorListQuery; +import com.ruoyi.cai.dto.app.vo.AnchorListVo; +import com.ruoyi.cai.enums.rank.RankDataTypeEnum; +import com.ruoyi.cai.mapper.LoveRankTodayMapper; +import com.ruoyi.cai.mq.handle.dto.RankNotifyDTO; +import com.ruoyi.cai.service.AnchorService; +import com.ruoyi.cai.service.LoveRankTodayService; +import com.ruoyi.cai.util.IdLockManager; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.helper.LoginHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.temporal.TemporalAdjusters; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + +@Service +public class LoveRankTodayServiceImpl extends ServiceImpl implements LoveRankTodayService { + + @Resource + private LoveRankTodayMapper loveRankTodayMapper; + @Autowired + private AnchorService anchorService; + + @Override + public List homePage(PageQuery pageQuery, AnchorListQuery query){ + if(pageQuery.checkPageNum(20)){ + return Collections.emptyList(); + } + pageQuery.resetPageSize(); + Anchor anchor = anchorService.getByUserId(LoginHelper.getUserId()); + if(anchor != null && anchor.getHiddenStatus() == 1){ + query.setHiddenStatusUser(true); + } + // 获取当前日期 + LocalDate today = LocalDate.now(); + // 获取本周的周一（如果今天是周一，则返回今天） + LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + Page page = baseMapper.homePage(pageQuery.build(), query,monday); + return page.getRecords(); + } + + @Override + public void addRank(RankNotifyDTO rank) { + // 获取当前日期 + LocalDate today = LocalDate.now(); + // 获取本周的周一（如果今天是周一，则返回今天） + LocalDate monday = today.with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); + // 获取本周的周日（如果今天是周日，则返回今天） + LocalDate sunday = today.with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); + LoveRankToday one = this.getOne(Wrappers.lambdaQuery(LoveRankToday.class) + .eq(LoveRankToday::getUserId, rank.getUserId()) + .eq(LoveRankToday::getDataType, RankDataTypeEnum.WEEK.getCode()) + .eq(LoveRankToday::getBeginRankTime, monday) + .last("limit 1")); + if(one == null){ + AtomicReference atomicReference = new AtomicReference<>(); + IdLockManager.executeWithLock(String.valueOf(rank.getUserId()), () -> { + LoveRankToday rankData = this.getOne(Wrappers.lambdaQuery(LoveRankToday.class) + .eq(LoveRankToday::getUserId, rank.getUserId()) + .eq(LoveRankToday::getDataType, RankDataTypeEnum.WEEK.getCode()) + .eq(LoveRankToday::getBeginRankTime, monday) + .last("limit 1")); + if(rankData == null){ + LoveRankToday saveData = new LoveRankToday(); + saveData.setDataType(RankDataTypeEnum.WEEK.getCode()); + saveData.setRankTime(monday); + saveData.setBeginRankTime(monday); + saveData.setEndRankTime(sunday); + saveData.setNum(0L); + saveData.setUserId(rank.getUserId()); + this.save(saveData); + atomicReference.set(saveData); + } + }); + one = atomicReference.get(); + } + loveRankTodayMapper.insRank(one.getId(), rank.getPrice()); + + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/IdLockManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/IdLockManager.java new file mode 100644 index 00000000..117c7b50 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/IdLockManager.java @@ -0,0 +1,38 @@ +package com.ruoyi.cai.util; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +public class IdLockManager { + // 存储ID对应的锁对象 + private static final ConcurrentHashMap idLocks = new ConcurrentHashMap<>(); + + /** + * 获取指定ID的锁 + */ + public static Lock getLock(String id) { + // 不存在则创建，存在则返回已有的锁 + return idLocks.computeIfAbsent(id, k -> new ReentrantLock()); + } + + /** + * 执行带ID锁的任务 + */ + public static void executeWithLock(String id, Runnable task) { + Lock lock = getLock(id); + try { + lock.lock(); // 获取锁 + task.run(); // 执行任务 + } finally { + lock.unlock(); // 确保释放锁 + } + } + + /** + * 清理不再使用的锁（可选） + */ + public static void cleanUpLock(String id) { + idLocks.remove(id); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RedisConstant.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RedisConstant.java index 6a129b29..fb0c00c5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RedisConstant.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/ws/constant/RedisConstant.java @@ -11,4 +11,5 @@ public class RedisConstant { public static final String USER_ROOM_DATA = REDIS_P + "room:%s:%s"; public static final String INIT_ROOM_LOCK = REDIS_P + "lock:initRoom:%s-%s"; public static final String Y4X_REDIS_CACHE = REDIS_P + "shareUrl:y4x:%s"; + public static final String START_SEND_MESSAGE_CACHE = REDIS_P + "starSendMessage:%s"; } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml index acc051bd..e9279013 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/AccountMapper.xml @@ -87,5 +87,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t1.create_time desc - + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/LoveRankTodayMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/LoveRankTodayMapper.xml new file mode 100644 index 00000000..5f5e9127 --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/LoveRankTodayMapper.xml @@ -0,0 +1,32 @@ + + + + + + update cai_love_rank_today + set num = num + #{value} + where id = #{id} + + + +