diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/WorldTypeAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/WorldTypeAdminVo.java index fd4745336..4cc9ad3e9 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/WorldTypeAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/WorldTypeAdminVo.java @@ -59,7 +59,7 @@ public class WorldTypeAdminVo { /** * 世界数 */ - private Integer worldNum; + private Long worldNum; public Long getId() { return id; @@ -133,11 +133,11 @@ public class WorldTypeAdminVo { this.tagPic = tagPic; } - public Integer getWorldNum() { + public Long getWorldNum() { return worldNum; } - public void setWorldNum(Integer worldNum) { + public void setWorldNum(Long worldNum) { this.worldNum = worldNum; } } diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/community/DynamicDataVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/community/DynamicDataVo.java index dc503075a..e11ba3751 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/community/DynamicDataVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/community/DynamicDataVo.java @@ -7,7 +7,7 @@ import lombok.Data; */ @Data public class DynamicDataVo extends DynamicVerifyVo{ - private Integer shareCount; + private Long shareCount; private Integer sharePeopleNum; diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupAdminVO.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupAdminVO.java index 42121431e..75d92ace8 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupAdminVO.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupAdminVO.java @@ -26,6 +26,6 @@ import java.util.List; @Data public class FlowTeamGroupAdminVO extends FlowTeamGroup { private List groupLeaders; - private Integer teamNum; + private Long teamNum; private Integer memberNum; } diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInfoAdminVO.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInfoAdminVO.java index 72c37c344..212985873 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInfoAdminVO.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInfoAdminVO.java @@ -26,5 +26,5 @@ import java.util.List; @Data public class FlowTeamInfoAdminVO extends FlowTeamInfo { private List teamLeaders; - private Integer memberNum; + private Long memberNum; } diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/link/ShortLinkAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/link/ShortLinkAdminVo.java index 4b39ca5b3..9ef64dd60 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/link/ShortLinkAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/link/ShortLinkAdminVo.java @@ -18,7 +18,7 @@ public class ShortLinkAdminVo extends ShortLink { * 累计点击数 */ @ApiModelProperty("累计点击数") - private Integer clickNum = 0; + private Long clickNum = 0L; /** * 累计点击uv diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateAdminVo.java index 9cabab7e6..619d4471f 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/lucky/LuckyBagFortunateAdminVo.java @@ -78,12 +78,12 @@ public class LuckyBagFortunateAdminVo extends LuckyBagFortunate { * 今日剩余库存 */ @ApiModelProperty("今日剩余库存") - private Integer todayResideStock; + private Long todayResideStock; /** * 已发放库存数量 */ @ApiModelProperty("已发放库存数量") - private Integer grantStock; + private Long grantStock; } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index c4d0dea25..04ccf53e9 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -242,7 +242,7 @@ public class MyApiService { public void selectMainlandAccount() { List dataList = new ArrayList<>(); - List accountList = accountService.list(null); + List accountList = accountService.list(); for (Account account : accountList) { boolean is86Phone = CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(), account.getPhone()) && "86".equals(account.getPhoneAreaCode()); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/FirstChargeRewardAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/FirstChargeRewardAdminService.java index 450befb31..62da3e0b3 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/FirstChargeRewardAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/charge/FirstChargeRewardAdminService.java @@ -184,8 +184,8 @@ public class FirstChargeRewardAdminService { if(reward.getId() == null){ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("first_charge_level_id",reward.getFirstChargeLevelId()); - Integer rewardNum = firstChargeRewardMapper.selectCount(wrapper); - if(rewardNum >= 6){ + long rewardNum = firstChargeRewardMapper.selectCount(wrapper); + if(rewardNum >= 6L){ throw new AdminServiceException("每个档位最多增加6个礼包"); } firstChargeRewardMapper.insert(reward); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/DressShopAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/DressShopAdminService.java index dfbe22b72..38841ca0b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/DressShopAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/dress/DressShopAdminService.java @@ -167,7 +167,7 @@ public class DressShopAdminService { } - public Integer getCount(Integer id, Byte dressType, Byte obtainWay) { + public long getCount(Integer id, Byte dressType, Byte obtainWay) { QueryWrapper wrapper = new QueryWrapper<>(); if (id != null) { wrapper.lambda().eq(DressShop::getId, id); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java index 01059498a..c094f1f62 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java @@ -559,7 +559,7 @@ public class FamilyManageAdminService { }*/ } - Integer memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); + long memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); if (memberNum >= family.getMemberNumLimit()){ throw new AdminServiceException(BusiStatus.FAMILY_MEMBER_MAX); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamGroupAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamGroupAdminService.java index 53d9a6d08..d501b5624 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamGroupAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamGroupAdminService.java @@ -252,9 +252,9 @@ public class FlowTeamGroupAdminService { private void checkAddTeam(Long groupId, String teamName) { - Integer teamNum = countGroupValidTeam(groupId); + long teamNum = countGroupValidTeam(groupId); String maxCount = sysConfService.getDefaultSysConfValueById(Constant.SysConfId.FLOW_TEAM_MAX_TEAM_COUNT, MAX_TEAM_COUNT.toString()); - if (teamNum >= Integer.parseInt(maxCount)) { + if (teamNum >= Long.parseLong(maxCount)) { throw new AdminServiceException(BusiStatus.SERVERBUSY, "超过团队小组上限"); } checkTeamName(teamName, null); @@ -305,7 +305,7 @@ public class FlowTeamGroupAdminService { return vo; } - private Integer countGroupValidTeam(Long groupId) { + private long countGroupValidTeam(Long groupId) { QueryWrapper query = new QueryWrapper<>(); query.lambda().eq(FlowTeamInfo::getGroupId, groupId) .eq(FlowTeamInfo::getStatus, FlowTeamConstant.MemberStatus.MEMBER_STATUS_VALID); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamService.java index aaf9a9dc0..941b5a038 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/flowteam/FlowTeamService.java @@ -174,7 +174,7 @@ public class FlowTeamService { } private void checkTeamMemberCount(String teamId) { - Integer memberCount = flowTeamMemberService.countValidMember(teamId); + long memberCount = flowTeamMemberService.countValidMember(teamId); if (memberCount > TEAM_MAX_MEMBER_COUNT) { throw new AdminServiceException(BusiStatus.BUSIERROR, "超过小组成员人数上限"); } @@ -311,8 +311,8 @@ public class FlowTeamService { } queryWrapper.lambda().exists("select 1 from flow_team_member_invite_code ic where flow_team_member.member_id = ic.member_id and ic.invite_code = '" + userInviteCode.getInviteCode() + "'"); queryWrapper.lambda().in(FlowTeamMember::getMemberStatus, Arrays.asList(MEMBER_STATUS_VALID, MEMBER_STATUS_INVALID)); - Integer count = flowTeamMemberMapper.selectCount(queryWrapper); - if (count > 0) { + long count = flowTeamMemberMapper.selectCount(queryWrapper); + if (count > 0L) { duplicateCods.add(userInviteCode.getInviteCode()); return; } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftCompoundAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftCompoundAdminService.java index fc2595e71..ba17771ce 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftCompoundAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/gift/GiftCompoundAdminService.java @@ -46,11 +46,10 @@ public class GiftCompoundAdminService { return giftCompoundList; } - public Integer getCount(Integer giftRewardType) { + public long getCount(Integer giftRewardType) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(GiftCompoundReward::getRewardType, giftRewardType); - int count = giftCompoundRewardService.count(); - return count; + return giftCompoundRewardService.count(); } public GiftCompoundRewardAdminVo getGiftCompoundById(Integer id) { diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/give/impl/GiveUserAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/give/impl/GiveUserAdminServiceImpl.java index f5f38beb2..f8e300a12 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/give/impl/GiveUserAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/give/impl/GiveUserAdminServiceImpl.java @@ -61,9 +61,9 @@ public class GiveUserAdminServiceImpl implements GiveUserAdminService { giveUser.setUid(Long.valueOf(uid)); giveUser.setCreateTime(now); giveUser.setOperatorId(adminId); - int count = giveUserService.count(Wrappers.lambdaQuery() + long count = giveUserService.count(Wrappers.lambdaQuery() .eq(GiveUser::getUid, uid)); - if (count > 0) { + if (count > 0L) { throw new AdminServiceException("添加失败，" + erBanNo + "已存在"); } giveUsers.add(giveUser); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java index 5065a2882..b74560197 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java @@ -496,7 +496,7 @@ public class GuildManageAdminService { } } - Integer memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); + long memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); if (memberNum >= guild.getMemberNumLimit()){ throw new AdminServiceException(BusiStatus.FAMILY_MEMBER_MAX); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java index e889f48a6..5b47fe172 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionLimitRecordAdminServiceImpl.java @@ -97,9 +97,9 @@ public class IpRegionLimitRecordAdminServiceImpl implements IpRegionLimitRecordA throw new AdminServiceException("无法添加"); } Long uid = users.getUid(); - int count = ipRegionLimitRecordService.count(Wrappers.lambdaQuery() + long count = ipRegionLimitRecordService.count(Wrappers.lambdaQuery() .eq(IpRegionLimitRecord::getUid, uid)); - if (count > 0) { + if (count > 0L) { throw new AdminServiceException(erBanNo + "已存在"); } String ip = users.getLastLoginIp(); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionWhiteAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionWhiteAdminServiceImpl.java index 57b8a8726..6daab5599 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionWhiteAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/ip/impl/IpRegionWhiteAdminServiceImpl.java @@ -64,9 +64,9 @@ public class IpRegionWhiteAdminServiceImpl implements IpRegionWhiteAdminService throw new AdminServiceException("[" + erBanNoStr + "]不存在"); } String uidStr = uidList.get(0); - int count = ipRegionWhiteService.count(Wrappers.lambdaQuery() + long count = ipRegionWhiteService.count(Wrappers.lambdaQuery() .eq(IpRegionWhite::getUid, Long.valueOf(uidStr))); - if (count == 0) { + if (count <= 0L) { Long uid = Long.valueOf(uidStr); Users users = usersBaseService.getUsersByUid(uid); ipRegionWhiteService.addIpRegionWhite(Long.valueOf(uidStr), users.getPhone(), IpRegionWhite.Source.ADMIN.getSource(), adminId); @@ -83,10 +83,10 @@ public class IpRegionWhiteAdminServiceImpl implements IpRegionWhiteAdminService if (users != null) { uid = users.getUid(); } - int count = ipRegionWhiteService.count(Wrappers.lambdaQuery() + long count = ipRegionWhiteService.count(Wrappers.lambdaQuery() .eq(uid != null, IpRegionWhite::getUid, uid) .eq(IpRegionWhite::getPhone, phone)); - if (count == 0) { + if (count <= 0L) { ipRegionWhiteService.addIpRegionWhite(uid, phone, IpRegionWhite.Source.ADMIN.getSource(), adminId); if (uid != null) { ipRegionLimitRecordService.remove(Wrappers.lambdaQuery() diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java index 1a52dcca6..40a6937a5 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolItemAdminService.java @@ -187,8 +187,8 @@ public class LinearlyPoolItemAdminService { } private LinearlyPoolDeployResultVO doDeploy() { - int draftItemCount = linearlyPrizePoolItemDraftService.count(); - if (draftItemCount <= 0) { + long draftItemCount = linearlyPrizePoolItemDraftService.count(); + if (draftItemCount <= 0L) { throw new AdminServiceException(BusiStatus.BUSIERROR, "奖池里面没有奖品,发布失败"); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagFortunateAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagFortunateAdminServiceImpl.java index 47d96ea61..34d55864a 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagFortunateAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyBagFortunateAdminServiceImpl.java @@ -56,15 +56,15 @@ public class LuckyBagFortunateAdminServiceImpl implements LuckyBagFortunateAdmin for (LuckyBagFortunateAdminVo record : records) { Long fortunateId = record.getId(); Integer dayLimit = record.getDayLimit(); - int dayStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() + long dayStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagFortunateRecord::getFortunateId, fortunateId) .between(LuckyBagFortunateRecord::getCreateTime, beginTimeOfDay, endTimeOfDay)); - int todayResideStock = dayLimit - dayStock; + long todayResideStock = dayLimit - dayStock; if (todayResideStock < 0) { todayResideStock = 0; } record.setTodayResideStock(todayResideStock); - int grantStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() + long grantStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagFortunateRecord::getFortunateId, fortunateId)); record.setGrantStock(grantStock); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java index 3e7909193..5e1b2e3f0 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/lucky/impl/LuckyGiftRewardAdminServiceImpl.java @@ -215,10 +215,10 @@ public class LuckyGiftRewardAdminServiceImpl implements LuckyGiftRewardAdminServ } private void initDefault(Integer giftId, Long rangeId, Date now) { - int count = luckyGiftRewardService.count(Wrappers.lambdaQuery() + long count = luckyGiftRewardService.count(Wrappers.lambdaQuery() .eq(LuckyGiftReward::getGiftId, giftId) .eq(LuckyGiftReward::getRangeId, rangeId)); - if (count == 0) { + if (count <= 0L) { LuckyGiftReward defaultConfig = new LuckyGiftReward(); defaultConfig.setGiftId(giftId); defaultConfig.setRangeId(rangeId); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java index 3fad0ced9..cdc9aea23 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/luckybag/LuckyBagAdminService.java @@ -85,8 +85,8 @@ public class LuckyBagAdminService extends ServiceImpl return false; } Date now = new Date(); - int poolCount = luckyBagPoolService.count(new LambdaQueryWrapper().eq(LuckyBagPool::getLuckyBagId, byId.getGiftId())); - if (poolCount == 0) { + long poolCount = luckyBagPoolService.count(new LambdaQueryWrapper().eq(LuckyBagPool::getLuckyBagId, byId.getGiftId())); + if (poolCount <= 0L) { throw new AdminServiceException(BusiStatus.PARAMERROR, "未配置福袋奖池，无法上线"); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/personalCenter/PersonalCenterAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/personalCenter/PersonalCenterAdminService.java index 4090c560e..3db40a8b8 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/personalCenter/PersonalCenterAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/personalCenter/PersonalCenterAdminService.java @@ -42,8 +42,8 @@ public class PersonalCenterAdminService { if(newPersonalCenter.getCenterId() == null && personalCenter == null){ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(PersonalCenter :: getCenterSeq, centerSeq); - Integer seqNum = personalCenterMapper.selectCount(wrapper); - if(seqNum >= 1){ + long seqNum = personalCenterMapper.selectCount(wrapper); + if(seqNum >= 1L){ throw new AdminServiceException("展示排序不能重复"); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/promiseStar/impl/PromiseStarConfigAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/promiseStar/impl/PromiseStarConfigAdminServiceImpl.java index de8ced897..d6d2161e2 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/promiseStar/impl/PromiseStarConfigAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/promiseStar/impl/PromiseStarConfigAdminServiceImpl.java @@ -39,9 +39,9 @@ public class PromiseStarConfigAdminServiceImpl implements PromiseStarConfigAdmin Date now = new Date(); Long id = config.getId(); if (id == null) { - int count = promiseStarConfigService.count(Wrappers.lambdaQuery() + long count = promiseStarConfigService.count(Wrappers.lambdaQuery() .eq(PromiseStarConfig::getGiftId, config.getGiftId())); - if (count > 0) { + if (count > 0L) { throw new ServiceException("礼物已存在"); } config.setCreateTime(now); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/redenvelope/impl/RoomRedEnvelopeAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/redenvelope/impl/RoomRedEnvelopeAdminServiceImpl.java index 7f85c0470..08b6212f1 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/redenvelope/impl/RoomRedEnvelopeAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/redenvelope/impl/RoomRedEnvelopeAdminServiceImpl.java @@ -63,10 +63,10 @@ public class RoomRedEnvelopeAdminServiceImpl implements RoomRedEnvelopeAdminServ roomRedEnvelope.setUid(uid); roomRedEnvelope.setType(RedEnvelopeTypeConstant.IN_ROOM | RedEnvelopeTypeConstant.SERVER); roomRedEnvelope.setCreateTime(now); - int count = roomRedEnvelopeService.count(Wrappers.lambdaQuery() + long count = roomRedEnvelopeService.count(Wrappers.lambdaQuery() .eq(RoomRedEnvelope::getRoomUid, uid) .eq(RoomRedEnvelope::getUid, uid)); - if (count == 0) { + if (count >= 0L) { roomRedEnvelopeService.save(roomRedEnvelope); } } @@ -90,10 +90,10 @@ public class RoomRedEnvelopeAdminServiceImpl implements RoomRedEnvelopeAdminServ roomRedEnvelope.setUid(uid); roomRedEnvelope.setType(type); roomRedEnvelope.setCreateTime(now); - int count = roomRedEnvelopeService.count(Wrappers.lambdaQuery() + long count = roomRedEnvelopeService.count(Wrappers.lambdaQuery() .eq(RoomRedEnvelope::getRoomUid, roomUid) .eq(RoomRedEnvelope::getUid, uid)); - if (count == 0) { + if (count >= 0L) { roomRedEnvelopeService.save(roomRedEnvelope); } else { throw new AdminServiceException("该用户已存在"); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/roomalbum/impl/RoomAlbumAdminServiceImpl.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/roomalbum/impl/RoomAlbumAdminServiceImpl.java index ec726880c..53137cd41 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/roomalbum/impl/RoomAlbumAdminServiceImpl.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/roomalbum/impl/RoomAlbumAdminServiceImpl.java @@ -70,10 +70,10 @@ public class RoomAlbumAdminServiceImpl implements RoomAlbumAdminService { roomAlbum.setRoomUid(uid); roomAlbum.setUid(uid); roomAlbum.setCreateTime(now); - int count = roomAlbumService.count(Wrappers.lambdaQuery() + long count = roomAlbumService.count(Wrappers.lambdaQuery() .eq(RoomAlbum::getRoomUid, uid) .eq(RoomAlbum::getUid, uid)); - if (count == 0) { + if (count >= 0L) { roomAlbumService.save(roomAlbum); } } @@ -96,10 +96,10 @@ public class RoomAlbumAdminServiceImpl implements RoomAlbumAdminService { roomAlbum.setRoomUid(roomUid); roomAlbum.setUid(uid); roomAlbum.setCreateTime(now); - int count = roomAlbumService.count(Wrappers.lambdaQuery() + long count = roomAlbumService.count(Wrappers.lambdaQuery() .eq(RoomAlbum::getRoomUid, roomUid) .eq(RoomAlbum::getUid, uid)); - if (count == 0) { + if (count >= 0L) { roomAlbumService.save(roomAlbum); } } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java index 8b70a694b..b4b1e5971 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/statistic/StatsUserDetailAdminService.java @@ -247,8 +247,8 @@ public class StatsUserDetailAdminService extends BaseService { stw.start(); try { QueryWrapper queryWrapper = new QueryWrapper<>(); - Integer count = roomVisitorUserDictMapper.selectCount(queryWrapper); - if (count != null && count > 0) return; + long count = roomVisitorUserDictMapper.selectCount(queryWrapper); + if (count > 0L) return; QueryWrapper visitorQuery = new QueryWrapper<>(); visitorQuery.lambda().orderByAsc(RoomVisitor::getStartTime); List roomVisitorList = roomVisitorMapper.selectList(visitorQuery); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAdminService.java index 884b740fe..e08d14149 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/vip/VipAdminService.java @@ -504,8 +504,8 @@ public class VipAdminService { queryWrapper.lambda().eq(VipAuthItem::getAuthType, Constant.VipAuthType.FACE).eq(VipAuthItem::getItemValue, faceId); if (null == id) { // 新增表情不能被任何贵族占用 - int count = vipAuthItemService.count(queryWrapper); - if (count > 0) { + long count = vipAuthItemService.count(queryWrapper); + if (count > 0L) { throw new AdminServiceException("当前表情已被其他贵族使用"); } } @@ -571,8 +571,8 @@ public class VipAdminService { queryWrapper.lambda().eq(VipAuthItem::getAuthType, Constant.VipAuthType.GIFT).eq(VipAuthItem::getItemValue, giftId.toString()); if (null == id) { // 新增礼物不能被任何贵族占用 - int count = vipAuthItemService.count(queryWrapper); - if (count > 0) { + long count = vipAuthItemService.count(queryWrapper); + if (count > 0L) { throw new AdminServiceException("当前礼物已被其他贵族使用"); } } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldTypeAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldTypeAdminService.java index f2b4ccbdb..be10eac2e 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldTypeAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/WorldTypeAdminService.java @@ -82,8 +82,8 @@ public class WorldTypeAdminService { public int deleteById(Long id) { //判断世界数是否为0 - int worldNum = countWorldNum(id); - if(worldNum > 0) { + long worldNum = countWorldNum(id); + if(worldNum > 0L) { throw new WorldException("删除失败，该分类的世界数大于0"); } WorldType record = new WorldType(); @@ -97,7 +97,7 @@ public class WorldTypeAdminService { return iWorldTypeService.queryByIdFromCache(id); } - private WorldTypeAdminVo convertVo(WorldType worldType, int worldNum) { + private WorldTypeAdminVo convertVo(WorldType worldType, long worldNum) { if(null == worldType) { return null; } @@ -115,7 +115,7 @@ public class WorldTypeAdminService { return vo; } - public int countWorldNum(Long id) { + public long countWorldNum(Long id) { QueryWrapper countWrapper = new QueryWrapper<>(); countWrapper.eq("world_type_id", id) .eq("`status`", WorldConstant.STATUS_VALID); diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java index 1d07fee3c..a33d7dace 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/world/community/DynamicDataAdminService.java @@ -125,8 +125,8 @@ public class DynamicDataAdminService extends BaseService { Integer sharePeopleNum = iDynamicShareService.countSharePeopleCountV2(verifyVo.getId()); dataVo.setSharePeopleNum(sharePeopleNum == null ? 0 : sharePeopleNum); //分享次数 - Integer shareCount = getShareCount(verifyVo.getId()); - dataVo.setShareCount(shareCount == null ? 0 : shareCount); + long shareCount = getShareCount(verifyVo.getId()); + dataVo.setShareCount(shareCount); //点赞人数 Integer likePeopleNum = iDynamicLikeService.countLikePeopleCountV2(verifyVo.getId(), null, null, null); dataVo.setLikePeopleNum(likePeopleNum == null ? 0 : likePeopleNum); @@ -150,7 +150,7 @@ public class DynamicDataAdminService extends BaseService { return dynamicDataVos; } - public Integer getShareCount(Long dynamicId){ + public long getShareCount(Long dynamicId){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("dynamic_id", dynamicId); return iDynamicShareService.count(queryWrapper); diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/vo/UserVo.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/vo/UserVo.java index 92950e4c9..82072d5a3 100644 --- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/vo/UserVo.java +++ b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/vo/UserVo.java @@ -192,7 +192,7 @@ public class UserVo { private Date limitChargeEndTime; @ApiModelProperty(value = "访客数量") - private Integer visitNum; + private Long visitNum; @ApiModelProperty(value = "进房数量") private Integer inRoomNum; diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/AccountService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/AccountService.java index 1b235e5ed..2c0e1d076 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/AccountService.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/AccountService.java @@ -93,7 +93,7 @@ public class AccountService extends ServiceImpl { /** * 根据手机号统计数量 */ - public int countByPhone(String phone) { + public long countByPhone(String phone) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(Account::getPhone, phone); return count(wrapper); @@ -196,12 +196,11 @@ public class AccountService extends ServiceImpl { return MD5.getMD5(password); } - public int getRegisterIpCountByOneDay(String ip) { + public long getRegisterIpCountByOneDay(String ip) { QueryWrapper wrapper = new QueryWrapper<>(); Date date = new Date(); wrapper.lambda().eq(Account::getRegisterIp, ip).between(Account::getSignTime, GetTimeUtils.getTimesnights(date, 0), GetTimeUtils.getTimesnights(date, 24)); - List accountList = list(wrapper); return count(wrapper); } diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java index bb1ec0050..7a51e4ab1 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java @@ -29,12 +29,12 @@ public class LoginRecordService { accountLoginRecordMapper.insert(accountLoginRecord); } - public int countLoginRecordToday(Long uid) { + public long countLoginRecordToday(Long uid) { Date date = new Date(); return countLoginRecordBetweenQueryTime(uid, DateTimeUtil.getBeginTimeOfDay(date), DateTimeUtil.getEndTimeOfDay(date)); } - public int countLoginRecordBetweenQueryTime(Long uid, Date startTime, Date endTime) { + public long countLoginRecordBetweenQueryTime(Long uid, Date startTime, Date endTime) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .eq(AccountLoginRecord::getUid, uid) .between(AccountLoginRecord::getCreateTime, startTime, endTime); diff --git a/accompany-base/accompany-core/pom.xml b/accompany-base/accompany-core/pom.xml index d053cd6bd..790d4948b 100644 --- a/accompany-base/accompany-core/pom.xml +++ b/accompany-base/accompany-core/pom.xml @@ -95,6 +95,12 @@ ${mybatisplus.version} + + com.baomidou + mybatis-plus-jsqlparser + ${mybatisplus.version} + + cn.hippo4j hippo4j-config-spring-boot-starter diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java index cc24cfe3c..5b17ff941 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java @@ -1,7 +1,9 @@ package com.accompany.core.config; import com.accompany.common.utils.ResourceUtil; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.github.pagehelper.PageInterceptor; import org.apache.ibatis.plugin.Interceptor; @@ -14,7 +16,6 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.sql.DataSource; -import java.io.IOException; import java.util.Properties; /** @@ -35,11 +36,16 @@ public class MybatisPlusConfig { "mapper/community/*Mapper.xml,sqlmappers/*.xml,oauth/*.xml"; /** - * 分页插件 + * 添加分页插件 */ - @Bean("paginationInterceptor") - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor(DbType.MYSQL); + paginationInnerInterceptor.setMaxLimit(10000L); + interceptor.addInnerInterceptor(paginationInnerInterceptor); // 如果配置多个插件, 切记分页最后添加 + // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType + return interceptor; } @Autowired @@ -47,14 +53,12 @@ public class MybatisPlusConfig { @Primary @Bean("sqlSessionFactory") - @DependsOn({"pageInterceptor", "paginationInterceptor"}) - public MybatisSqlSessionFactoryBean sqlSessionFactoryBean(Interceptor pageInterceptor, - PaginationInterceptor paginationInterceptor) { + @DependsOn({"pageInterceptor"}) + public MybatisSqlSessionFactoryBean sqlSessionFactoryBean(Interceptor pageInterceptor, MybatisPlusInterceptor mybatisPlusInterceptor){ MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean(); sqlSessionFactoryBean.setDataSource(dataSource); sqlSessionFactoryBean.setMapperLocations(ResourceUtil.getPathMatchingResource(mapperLocations)); - paginationInterceptor.setLimit(10000L); - sqlSessionFactoryBean.setPlugins(new Interceptor[]{pageInterceptor, paginationInterceptor}); + sqlSessionFactoryBean.setPlugins(pageInterceptor, mybatisPlusInterceptor); return sqlSessionFactoryBean; } diff --git a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/GiftSendRecord.java b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/GiftSendRecord.java index d703b4846..11aa920e6 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/GiftSendRecord.java +++ b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/GiftSendRecord.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class GiftSendRecord { - @TableId(type = IdType.ID_WORKER) + @TableId(type = IdType.ASSIGN_ID) private Long sendRecordId; private Long uid; diff --git a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/Lucky24Record.java b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/Lucky24Record.java index c7eb0bde8..bc9528ab8 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/Lucky24Record.java +++ b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/Lucky24Record.java @@ -11,7 +11,7 @@ import java.util.Date; @Data public class Lucky24Record { - @TableId(type = IdType.ID_WORKER) + @TableId(type = IdType.ASSIGN_ID) private Long id; private Integer partitionId; private Long uid; diff --git a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/UserChatMsgRecord.java b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/UserChatMsgRecord.java index 078923d74..126d72e59 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/UserChatMsgRecord.java +++ b/accompany-base/accompany-sharding/accompany-sharding-sdk/src/main/java/com/accompany/sharding/model/UserChatMsgRecord.java @@ -22,7 +22,7 @@ public class UserChatMsgRecord { * 主键 */ @ApiModelProperty("主键") - @TableId(type = IdType.UUID) + @TableId(type = IdType.ASSIGN_UUID) private String id; /** diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java index 586e55f22..7284910a9 100644 --- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java +++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/java/com/accompany/sharding/config/ShardingSphereConfig.java @@ -2,7 +2,9 @@ package com.accompany.sharding.config; import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.ResourceUtil; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import org.apache.ibatis.plugin.Interceptor; import org.apache.shardingsphere.driver.api.ShardingSphereDataSourceFactory; @@ -60,14 +62,14 @@ public class ShardingSphereConfig { } @Bean("shardingSqlSessionFactory") - @DependsOn({"shardingDataSource", "pageInterceptor", "paginationInterceptor"}) + @DependsOn({"shardingDataSource", "pageInterceptor"}) public MybatisSqlSessionFactoryBean sqlSessionFactoryBean(DataSource shardingDataSource, - Interceptor pageInterceptor, PaginationInterceptor paginationInterceptor) throws IOException { + Interceptor pageInterceptor, MybatisPlusInterceptor mybatisPlusInterceptor) { MybatisSqlSessionFactoryBean sqlSessionFactoryBean = new MybatisSqlSessionFactoryBean(); sqlSessionFactoryBean.setDataSource(shardingDataSource); String mapperLocations = "classpath*:/sharding/sqlmappers/*.xml"; sqlSessionFactoryBean.setMapperLocations(ResourceUtil.getPathMatchingResource(mapperLocations)); - sqlSessionFactoryBean.setPlugins(new Interceptor[]{pageInterceptor, paginationInterceptor}); + sqlSessionFactoryBean.setPlugins(pageInterceptor, mybatisPlusInterceptor); return sqlSessionFactoryBean; } diff --git a/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/CommentReplyInfoVo.java b/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/CommentReplyInfoVo.java index 014d74fb3..9d9ec53a0 100644 --- a/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/CommentReplyInfoVo.java +++ b/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/CommentReplyInfoVo.java @@ -24,7 +24,7 @@ public class CommentReplyInfoVo { private Long nextTimestamp; /** 还剩xxx条回复 */ - private Integer leftCount; + private Long leftCount; /** 回复列表 */ private List replyList; @@ -35,7 +35,7 @@ public class CommentReplyInfoVo { */ public static CommentReplyInfoVo defaultVal() { CommentReplyInfoVo info = new CommentReplyInfoVo(); - info.setLeftCount(0); + info.setLeftCount(0L); info.setReplyList(new ArrayList<>()); return info; } diff --git a/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/DynamicCommentReplySingleVo.java b/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/DynamicCommentReplySingleVo.java index 83fb09461..ca55b402e 100644 --- a/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/DynamicCommentReplySingleVo.java +++ b/accompany-business/accompany-business-community/accompany-business-community-sdk/src/main/java/com/accompany/community/vo/DynamicCommentReplySingleVo.java @@ -12,6 +12,6 @@ import lombok.Data; public class DynamicCommentReplySingleVo extends DynamicCommentReplyVo { /** 该评论下的回复数 */ - private Integer replyCount; + private Long replyCount; } diff --git a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/IDynamicCommentService.java b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/IDynamicCommentService.java index b1eeb0040..f9bfa7bec 100644 --- a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/IDynamicCommentService.java +++ b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/IDynamicCommentService.java @@ -89,10 +89,11 @@ public interface IDynamicCommentService extends IService { /** * 统计数量 + * * @param condition * @return */ - Integer selectDynamicCommentCount(DynamicCommentCondition condition); + long selectDynamicCommentCount(DynamicCommentCondition condition); /** * 统计评论数据 diff --git a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicCommentServiceImpl.java b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicCommentServiceImpl.java index cbca4e5dd..50570b687 100644 --- a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicCommentServiceImpl.java +++ b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicCommentServiceImpl.java @@ -84,11 +84,12 @@ public class DynamicCommentServiceImpl extends ServiceImpl queryWrapper = getQueryWrapper(condition); return dynamicCommentMapper.selectCount(queryWrapper); } @@ -110,9 +111,9 @@ public class DynamicCommentServiceImpl extends ServiceImpl 0) { condition.setWorldId(param.getWorldId()); } - Integer count = selectDynamicCommentCount(condition); + long count = selectDynamicCommentCount(condition); // 由于sharding jdbc 的原因，这里需要判断下是否有记录，不然会报npe - if(count == null || count <= 0) { + if(count <= 0L) { return new ArrayList<>(); } // sharding jdbc的distinct有问题，这里分开两次统计 @@ -350,12 +351,12 @@ public class DynamicCommentServiceImpl extends ServiceImpl impl @Override public List selectDynamicList(DynamicCondition condition) { QueryWrapper queryWrapper = getQueryWrapper(condition); - if(ArrayUtils.isNotEmpty(condition.getOrderByAsc())) { - queryWrapper.orderByAsc(condition.getOrderByAsc()); - } - if(ArrayUtils.isNotEmpty(condition.getOrderByDesc())) { - queryWrapper.orderByDesc(condition.getOrderByDesc()); - } + //if(ArrayUtils.isNotEmpty(condition.getOrderByAsc())) { + // queryWrapper.orderByAsc(condition.getOrderByAsc()); + //} + //if(ArrayUtils.isNotEmpty(condition.getOrderByDesc())) { + // queryWrapper.orderByDesc(condition.getOrderByDesc()); + //} if(null != condition.getLimit()) { queryWrapper.last(" limit " + condition.getLimit()); } diff --git a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicStatServiceImpl.java b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicStatServiceImpl.java index 04f571b87..d1cad8d13 100644 --- a/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicStatServiceImpl.java +++ b/accompany-business/accompany-business-community/accompany-business-community-service/src/main/java/com/accompany/community/service/impl/DynamicStatServiceImpl.java @@ -233,12 +233,12 @@ public class DynamicStatServiceImpl extends ServiceImpllambdaQuery() + long count = actTaskRewardService.count(Wrappers.lambdaQuery() .eq(ActTaskReward::getActivityCode, activityCode) .eq(ActTaskReward::getTaskCode, taskCode) .eq(StrUtil.isNotEmpty(conditionCode), ActTaskReward::getConditionCode, conditionCode)); - if (count > 0) { + if (count > 0L) { Long userTaskId = actUserTask.getId(); log.info("sendUser userTaskId : {}", userTaskId); ActTaskRewardMqMessage message = new ActTaskRewardMqMessage(); @@ -134,11 +134,11 @@ public class ActUserTaskConsumer extends AbstractMessageListenerlambdaQuery() + long count = actTaskRewardService.count(Wrappers.lambdaQuery() .eq(ActTaskReward::getActivityCode, activityCode) .eq(ActTaskReward::getTaskCode, taskCode) .eq(StrUtil.isNotEmpty(conditionCode), ActTaskReward::getConditionCode, conditionCode)); - if (count > 0) { + if (count > 0L) { Long userTaskId = actUserTask.getId(); log.info("receiveUser userTaskId : {}", userTaskId); ActTaskRewardMqMessage message = new ActTaskRewardMqMessage(); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IGiftBoxTaskHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IGiftBoxTaskHandler.java index 435de6538..4f3c12f49 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IGiftBoxTaskHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/handle/IGiftBoxTaskHandler.java @@ -165,7 +165,7 @@ public class IGiftBoxTaskHandler extends IActTaskHandler { actUserTask.setTaskStatus(ActTaskStatusEnum.COMPLETE.ordinal()); jedisService.set(RedisKey.act_user_complete_task_status.getKey(context.getGiftSendUuid()), String.valueOf(actUserTask.getId()), 5 * 60); } - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, parentCode) @@ -173,7 +173,7 @@ public class IGiftBoxTaskHandler extends IActTaskHandler { .eq(ActUserTask::getStartTime, startTime) .eq(ActUserTask::getEndTime, endTime) .between(ActUserTask::getCreateTime, startTime, endTime)); - if (taskCount == 0) { + if (taskCount <= 0) { actUserTaskService.save(actUserTask); } else { actUserTaskService.updateById(actUserTask); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/impl/ActUserTaskServiceImpl.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/impl/ActUserTaskServiceImpl.java index c15940d49..77ef48efb 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/impl/ActUserTaskServiceImpl.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/activity/service/impl/ActUserTaskServiceImpl.java @@ -92,8 +92,8 @@ public class ActUserTaskServiceImpl extends ServiceImpllambdaQuery().eq(ActActivity::getActivityCode, activityCode).eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES).le(ActActivity::getStartTime, now).ge(ActActivity::getEndTime, now)); - if (count == 0) { + long count = actActivityService.count(Wrappers.lambdaQuery().eq(ActActivity::getActivityCode, activityCode).eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES).le(ActActivity::getStartTime, now).ge(ActActivity::getEndTime, now)); + if (count >= 0) { throw new ServiceException(BusiStatus.NOT_IN_ACT_TIME_RANGE); } Long uid = UidContextHolder.get(); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java index 719cae60a..20374991c 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayGardenService.java @@ -155,7 +155,7 @@ public class ChildrenDayGardenService { ActTaskReward actTaskReward = any.get(); Long rewardId = actTaskReward.getRewardId(); String rewardType = actTaskReward.getRewardType(); - int drawCount = actUserRecordService.count(Wrappers.lambdaQuery() + long drawCount = actUserRecordService.count(Wrappers.lambdaQuery() .eq(ActUserRecord::getActivityCode, ACTIVITY_CODE) .eq(ActUserRecord::getComponentCode, COMPONENT_CODE) .eq(ActUserRecord::getTaskCode, TASK_CODE) @@ -193,7 +193,7 @@ public class ChildrenDayGardenService { ActTaskReward actTaskReward = any.get(); Long rewardId = actTaskReward.getRewardId(); String rewardType = actTaskReward.getRewardType(); - int drawCount = actUserRecordService.count(Wrappers.lambdaQuery() + long drawCount = actUserRecordService.count(Wrappers.lambdaQuery() .eq(ActUserRecord::getActivityCode, ACTIVITY_CODE) .eq(ActUserRecord::getComponentCode, COMPONENT_CODE) .eq(ActUserRecord::getTaskCode, TASK_CODE) diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java index adbec9af0..c99114370 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/children/service/ChildrenDayTaskService.java @@ -78,11 +78,11 @@ public class ChildrenDayTaskService { String COMPONENT_CODE = "MEI_RI_REN_WU"; String TASK_CODE = "FOLLOW_NEW_FRIEND"; Date now = new Date(); - int count = actActivityService.count(Wrappers.lambdaQuery() + long count = actActivityService.count(Wrappers.lambdaQuery() .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) .le(ActActivity::getStartTime, now) .ge(ActActivity::getEndTime, now)); - if (count == 0) { + if (count <= 0L) { return; } if (FansService.LIKE.equals(type)) { @@ -169,11 +169,11 @@ public class ChildrenDayTaskService { String COMPONENT_CODE = "XUN_HUAN_REN_WU"; String TASK_CODE = "JOIN_PROMISE_STAR_FOR_10"; Date now = new Date(); - int count = actActivityService.count(Wrappers.lambdaQuery() + long count = actActivityService.count(Wrappers.lambdaQuery() .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) .le(ActActivity::getStartTime, now) .ge(ActActivity::getEndTime, now)); - if (count == 0) { + if (count >= 0L) { return; } actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid); @@ -184,11 +184,11 @@ public class ChildrenDayTaskService { String COMPONENT_CODE = "XUN_HUAN_REN_WU"; String TASK_CODE = "JOIN_GREEDY_FOR_1000"; Date now = new Date(); - int count = actActivityService.count(Wrappers.lambdaQuery() + long count = actActivityService.count(Wrappers.lambdaQuery() .eq(ActActivity::getActivityStatus, Constant.Yes1No0.YES) .le(ActActivity::getStartTime, now) .ge(ActActivity::getEndTime, now)); - if (count == 0) { + if (count >= 0L) { return; } actUserTaskService.increment(ACTIVITY_CODE, COMPONENT_CODE, TASK_CODE, uid, diamondNum.intValue(), true, true); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java index 420bfd7ca..af90f335a 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/handler/AprilFoolsDayBoxHandler.java @@ -58,14 +58,14 @@ public class AprilFoolsDayBoxHandler extends IGiftBoxTaskHandler { ActTask actTask = context.getActTask(); String activityCode = actTask.getActivityCode(); String componentCode = actTask.getComponentCode(); - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getUid, uid) .eq(ActUserTask::getStartTime, startTime) .eq(ActUserTask::getEndTime, endTime) .between(ActUserTask::getCreateTime, startTime, endTime)); - if (taskCount == 1) { + if (taskCount == 1L) { if (roomUid != null) { Room room = roomService.getRoomByUid(roomUid); Users users = usersBaseService.getUsersByUid(uid); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java index ba1a7e17c..9d52d689f 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/handler/RepairSignInHandler.java @@ -141,13 +141,13 @@ public class RepairSignInHandler extends IActTaskHandler { completeArray[i] = false; ActTask children = actTasks.get(i); String taskCode = children.getTaskCode(); - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) .eq(ActUserTask::getUid, uid) .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal())); - completeArray[i] = taskCount > 0; + completeArray[i] = taskCount > 0L; } long count = Arrays.stream(completeArray).filter(v -> v).count(); log.info("task taskCount : {}", count); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java index e0558bf98..1b69309ab 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/signin/service/ActSignInService.java @@ -149,11 +149,11 @@ public class ActSignInService { .between(ActUserTask::getCreateTime, actActivity.getStartTime(), actActivity.getEndTime())); if (CollectionUtil.isNotEmpty(actUserTasks)) { for (ActUserTask userTask : actUserTasks) { - int count = actTaskRewardService.count(Wrappers.lambdaQuery() + long count = actTaskRewardService.count(Wrappers.lambdaQuery() .eq(ActTaskReward::getActivityCode, activityCode) .eq(ActTaskReward::getTaskCode, userTask.getTaskCode()) .eq(StrUtil.isNotEmpty(userTask.getConditionCode()), ActTaskReward::getConditionCode, userTask.getConditionCode())); - if (count > 0) { + if (count > 0L) { Long userTaskId = actUserTask.getId(); log.info("sendUser userTaskId : {}", userTaskId); ActTaskRewardMqMessage message = new ActTaskRewardMqMessage(); @@ -162,7 +162,7 @@ public class ActSignInService { } } } - int count = actUserTaskService.count(Wrappers.lambdaQuery() + long count = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getUid, uid)); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java index 7d7ca97b4..8d0890b35 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftReceiveHandler.java @@ -103,13 +103,13 @@ public class WomenDayLimitGiftReceiveHandler extends IActTaskHandler { completeArray[i] = false; ActTask children = actTasks.get(i); String taskCode = children.getTaskCode(); - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) .eq(ActUserTask::getUid, uid) .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - completeArray[i] = taskCount > 0; + completeArray[i] = taskCount > 0L; } long count = Arrays.stream(completeArray).filter(v -> v).count(); log.info("task taskCount : {}", count); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java index 3505080c5..68eeac505 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLimitGiftSendHandler.java @@ -103,13 +103,13 @@ public class WomenDayLimitGiftSendHandler extends IActTaskHandler { completeArray[i] = false; ActTask children = actTasks.get(i); String taskCode = children.getTaskCode(); - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) .eq(ActUserTask::getUid, uid) .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal())); - completeArray[i] = taskCount > 0; + completeArray[i] = taskCount > 0L; } long count = Arrays.stream(completeArray).filter(v -> v).count(); log.info("task taskCount : {}", count); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java index 2e32941df..2f963307d 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingReceiveHandler.java @@ -52,7 +52,7 @@ public class WomenDayLoveWingReceiveHandler extends IActTaskHandler { return false; } ActTaskCondition condition = conditions.get(0); - int completeCount = actUserTaskService.count(Wrappers.lambdaQuery() + long completeCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) @@ -61,7 +61,7 @@ public class WomenDayLoveWingReceiveHandler extends IActTaskHandler { .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal()) .between(ActUserTask::getCreateTime, startTime, endTime) .orderByAsc(ActUserTask::getCreateTime)); - if (completeCount > 0) { + if (completeCount > 0L) { log.info("gift receive ge taskCode : {} is already complete.", taskCode); return true; } @@ -133,7 +133,7 @@ public class WomenDayLoveWingReceiveHandler extends IActTaskHandler { } actUserTask.setId(task.getId()); } - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) @@ -141,7 +141,7 @@ public class WomenDayLoveWingReceiveHandler extends IActTaskHandler { .eq(ActUserTask::getUid, uid) .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) .between(ActUserTask::getCreateTime, startTime, endTime)); - actUserTask.setActivityValue((long) taskCount); + actUserTask.setActivityValue(taskCount); int taskStatus = ActTaskStatusEnum.PROCESS.ordinal(); if (conditionValue <= taskCount) { taskStatus = ActTaskStatusEnum.COMPLETE.ordinal(); diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java index 740122e2e..7630bebd4 100644 --- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java +++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/women/handler/WomenDayLoveWingSendHandler.java @@ -52,7 +52,7 @@ public class WomenDayLoveWingSendHandler extends IActTaskHandler { return false; } ActTaskCondition condition = conditions.get(0); - int completeCount = actUserTaskService.count(Wrappers.lambdaQuery() + long completeCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) @@ -61,7 +61,7 @@ public class WomenDayLoveWingSendHandler extends IActTaskHandler { .in(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal(), ActTaskStatusEnum.GRANT.ordinal()) .between(ActUserTask::getCreateTime, startTime, endTime) .orderByAsc(ActUserTask::getCreateTime)); - if (completeCount > 0) { + if (completeCount > 0L) { log.info("gift send ge taskCode : {} is already complete.", taskCode); return true; } @@ -133,7 +133,7 @@ public class WomenDayLoveWingSendHandler extends IActTaskHandler { } actUserTask.setId(task.getId()); } - int taskCount = actUserTaskService.count(Wrappers.lambdaQuery() + long taskCount = actUserTaskService.count(Wrappers.lambdaQuery() .eq(ActUserTask::getActivityCode, activityCode) .eq(ActUserTask::getComponentCode, componentCode) .eq(ActUserTask::getTaskCode, taskCode) @@ -141,7 +141,7 @@ public class WomenDayLoveWingSendHandler extends IActTaskHandler { .eq(ActUserTask::getUid, uid) .eq(ActUserTask::getTaskStatus, ActTaskStatusEnum.COMPLETE.ordinal()) .between(ActUserTask::getCreateTime, startTime, endTime)); - actUserTask.setActivityValue((long) taskCount); + actUserTask.setActivityValue(taskCount); int taskStatus = ActTaskStatusEnum.PROCESS.ordinal(); if (conditionValue <= taskCount) { taskStatus = ActTaskStatusEnum.COMPLETE.ordinal(); diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/dress/UserPersonalBackgroundRecord.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/dress/UserPersonalBackgroundRecord.java index 7855db9bb..c308cee8d 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/dress/UserPersonalBackgroundRecord.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/dress/UserPersonalBackgroundRecord.java @@ -1,6 +1,7 @@ package com.accompany.business.model.dress; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +16,7 @@ import java.util.Date; @Data @TableName("user_personal_background_record") public class UserPersonalBackgroundRecord { - @TableField("record_id") + @TableId("record_id") private Long recordId; @TableField("uid") private Long uid; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/user/UserActPropertyInfoV2.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/user/UserActPropertyInfoV2.java index 7c635c666..c00fee077 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/user/UserActPropertyInfoV2.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/user/UserActPropertyInfoV2.java @@ -19,7 +19,7 @@ public class UserActPropertyInfoV2 { @TableId(value = "id", type = IdType.AUTO) private Integer id; - @TableId(value = "uid") + @TableField(value = "uid") private Long uid; @TableField(value = "piece_num") private Long pieceNum; diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTaskInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTaskInfoVo.java index bcdd3195e..91255d603 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTaskInfoVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTaskInfoVo.java @@ -20,7 +20,7 @@ public class AnchorFansTaskInfoVo { @ApiModelProperty(value = "主播昵称") private String anchorNick; @ApiModelProperty(value = "粉丝团总人数") - private Integer teamNum; + private Long teamNum; @ApiModelProperty(value = "当前用户uid") private Long memberUid; @ApiModelProperty(value = "当前用户头像") diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTeamMessageVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTeamMessageVo.java index bb4d4f799..08be5a479 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTeamMessageVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/AnchorFansTeamMessageVo.java @@ -9,5 +9,5 @@ public class AnchorFansTeamMessageVo { private Long uid; private String nickname; private GiftVo giftVo; // 入团礼物实体 - private Integer count; // 当前粉丝团数量 + private Long count; // 当前粉丝团数量 } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/ApplyFansTeamPopInfoVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/ApplyFansTeamPopInfoVo.java index 7fbed1a2d..edf05617b 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/ApplyFansTeamPopInfoVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/ApplyFansTeamPopInfoVo.java @@ -20,7 +20,7 @@ public class ApplyFansTeamPopInfoVo { @ApiModelProperty(value = "主播名称") private String anchorNick; @ApiModelProperty(value = "粉丝团总人数") - private Integer teamNum; + private Long teamNum; @ApiModelProperty(value = "榜单前三用户头像") private List avatarList = new ArrayList<>(); diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/InRoomFansTeamInitVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/InRoomFansTeamInitVo.java index 7a4cc4a29..c001393d1 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/InRoomFansTeamInitVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/anchor/InRoomFansTeamInitVo.java @@ -13,7 +13,7 @@ public class InRoomFansTeamInitVo { @ApiModelProperty(value = "粉丝团入口是否红点提示：是-true,否-false") private Boolean isRedPop; @ApiModelProperty(value = "粉丝团成员总数") - private Integer anchorFansNum; + private Long anchorFansNum; @ApiModelProperty(value = "用户是否为当前房间的粉丝团成员：是-true,否-false") private Boolean isAnchorFans; @ApiModelProperty(value = "粉丝团成员等级") diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectGiftVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectGiftVo.java index 836fa2c5c..531080904 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectGiftVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectGiftVo.java @@ -35,5 +35,5 @@ public class LuckyBagCollectGiftVo { * 收到礼物数量 */ @ApiModelProperty("收到礼物数量") - private Integer receiveNum; + private Long receiveNum; } diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectVo.java index 0fc3f07a3..2cc62c8a3 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/lucky/LuckyBagCollectVo.java @@ -38,7 +38,7 @@ public class LuckyBagCollectVo { * 可领取数量 */ @ApiModelProperty("领取数量") - private Integer drawNum = 0; + private Long drawNum = 0L; /** * 每日库存 diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/redenvelope/RedEnvelopeResponseVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/redenvelope/RedEnvelopeResponseVo.java index 854f57c07..2162a209f 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/redenvelope/RedEnvelopeResponseVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/redenvelope/RedEnvelopeResponseVo.java @@ -42,7 +42,7 @@ public class RedEnvelopeResponseVo { private Date endTime; @ApiModelProperty("已经领取红包数目") - private int pickNum; + private long pickNum; private Date createTime; private Date updateTime; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java index d3c41c24a..e16b56d7d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagCollectForLightListener.java @@ -146,7 +146,7 @@ public class LuckyBagCollectForLightListener implements ApplicationListenerlambdaQuery() + long dayStockCount = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.LIGHT_UP.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, recvUid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java index b90781564..b6d389f6c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/lucky/LuckyBagFortunateListener.java @@ -116,14 +116,14 @@ public class LuckyBagFortunateListener implements ApplicationListenerlambdaQuery() + long dayStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagFortunateRecord::getFortunateId, fortunateId) .between(LuckyBagFortunateRecord::getCreateTime, beginTimeOfDay, endTimeOfDay)); if (dayStock >= dayLimit) { log.info("LuckyBagFortunateListener dayStock : {}, dayLimit : {}", dayStock, dayLimit); continue; } - int totalStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() + long totalStock = luckyBagFortunateRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagFortunateRecord::getFortunateId, fortunateId) .ge(startTime != null, LuckyBagFortunateRecord::getCreateTime, startTime) .le(endTime != null, LuckyBagFortunateRecord::getCreateTime, endTime)); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/miniGame/MiniGameRoundMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/miniGame/MiniGameRoundMapper.java index fb3fd1213..8329c70cd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/miniGame/MiniGameRoundMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/miniGame/MiniGameRoundMapper.java @@ -35,5 +35,5 @@ public interface MiniGameRoundMapper extends BaseMapper { Byte getLatestState(@Param("roomUid") Long roomUid); - int insertOrUpdate(@Param("param") MiniGameRound round); + boolean insertOrUpdate(@Param("param") MiniGameRound round); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java index 292f0042e..3881e401a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/PageActivityService.java @@ -41,7 +41,7 @@ public class PageActivityService extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(PageActivity::getCode,code); return count(wrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMemberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMemberService.java index 385713698..501055ad0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMemberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamMemberService.java @@ -9,10 +9,11 @@ import java.util.List; public interface AnchorFansTeamMemberService extends IService { /** * 根据粉丝团id 获取对应的粉丝总人数 + * * @param teamId * @return */ - int getTeamMemberCountByTeamId(Long teamId); + long getTeamMemberCountByTeamId(Long teamId); /** * 根据成员uid 判断对应粉丝团是否存在对应的粉丝 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamService.java index ddd7f02c2..31c23b67c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/AnchorFansTeamService.java @@ -5,7 +5,6 @@ import com.accompany.business.model.anchor.AnchorFansTeam; import com.accompany.business.vo.anchor.*; import com.baomidou.mybatisplus.extension.service.IService; -import java.awt.*; import java.io.IOException; import java.text.ParseException; import java.util.Date; @@ -77,10 +76,11 @@ public interface AnchorFansTeamService extends IService { /** * 获取该用户的粉丝团成员数量 + * * @param teamId * @return */ - Integer getAnchorFansTeamMemberCountByTeamId(Long teamId); + long getAnchorFansTeamMemberCountByTeamId(Long teamId); /** * 是否为对应用户的粉丝团成员 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMemberServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMemberServiceImpl.java index 7baf2e7fc..a8cbeb6f6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMemberServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamMemberServiceImpl.java @@ -10,7 +10,6 @@ import com.accompany.business.service.anchor.AnchorFansTeamService; import com.accompany.business.vo.anchor.AnchorFansMemberVo; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; -import com.accompany.common.utils.DateTimeUtil; import com.accompany.common.utils.StringUtils; import com.accompany.core.service.common.JedisService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,9 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -47,7 +44,7 @@ public class AnchorFansTeamMemberServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(AnchorFansTeamMember::getTeamId,teamId).eq(AnchorFansTeamMember::getStatus, Constant.GlobalStatus.valid); return baseMapper.selectCount(wrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java index 90ad59ba1..74f7f5cad 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/anchor/impl/AnchorFansTeamServiceImpl.java @@ -945,7 +945,7 @@ public class AnchorFansTeamServiceImpl extends ServiceImpl rewardRecordWrapper = new QueryWrapper<>(); rewardRecordWrapper.eq("uid", uid); - int countRewardRecord = firstChargeRewardRecordService.count(rewardRecordWrapper); + long countRewardRecord = firstChargeRewardRecordService.count(rewardRecordWrapper); long timeMillis = System.currentTimeMillis(); - if (countRewardRecord > 0) { + if (countRewardRecord > 0L) { jedisService.hset(RedisKey.first_charge_reward_user.getKey(), uid.toString(), "false"); log.info("首充激励：用户已存在首充记录中:{},记录次数为:{},当前时间为:{}", uid, countRewardRecord, countRewardRecord, timeMillis); return; @@ -428,7 +428,7 @@ public class FirstChargeRewardService extends BaseService { if (chargeRewardUser) { return Boolean.valueOf(jedisService.hget(RedisKey.first_charge_reward_user.getKey(), uid.toString())); } - int countRewardRecord = firstChargeRewardRecordService.count(Wrappers.lambdaQuery() + long countRewardRecord = firstChargeRewardRecordService.count(Wrappers.lambdaQuery() .eq(FirstChargeRewardRecord::getUid, uid)); long timeMillis = System.currentTimeMillis(); if (countRewardRecord > 0) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicCommentService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicCommentService.java index 9b232bb88..e22f832dd 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicCommentService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicCommentService.java @@ -278,10 +278,7 @@ public class DynamicCommentService extends CommunityBaseService { } Long nextTimestamp = list.get(list.size() - 1).getPublishTime(); condition.setCreateTimestampStart(nextTimestamp); - Integer leftCount = iDynamicCommentService.selectDynamicCommentCount(condition); - if(null == leftCount) { - leftCount = 0; - } + long leftCount = iDynamicCommentService.selectDynamicCommentCount(condition); return CommentReplyInfoVo.builder() .nextTimestamp(nextTimestamp) .leftCount(leftCount) @@ -311,8 +308,8 @@ public class DynamicCommentService extends CommunityBaseService { CommentStatusEnum.IMPEACH.getValue() )) .build(); - Integer count = iDynamicCommentService.selectDynamicCommentCount(condition); - singleVo.setReplyCount(null == count ? 0 : count); + long count = iDynamicCommentService.selectDynamicCommentCount(condition); + singleVo.setReplyCount(count); return singleVo; } @@ -414,16 +411,6 @@ public class DynamicCommentService extends CommunityBaseService { return iDynamicCommentService.statCommentData(commentStatParam); } - public int countByUidToday(Long uid) { - Date date = new Date(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(DynamicComment::getFromUid, uid) - .ne(DynamicComment::getToUid, uid) - .in(DynamicComment::getStatus, 0, 1) - .between(DynamicComment::getCreateTimestamp, DateTimeUtil.getBeginTimeOfDay(date).getTime(), DateTimeUtil.getEndTimeOfDay(date).getTime()); - return iDynamicCommentService.count(wrapper); - } - /** * 评论发布开关 */ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java index 4ea8a3aac..5f458cd52 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicLikeService.java @@ -43,13 +43,4 @@ public class DynamicLikeService extends CommunityBaseService { return iDynamicLikeService.statLikeData(likeCondition); } - public int countByUidToday(Long uid) { - Date date = new Date(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(DynamicLike::getUid, uid) - .ne(DynamicLike::getLikedUid, uid) - .eq(DynamicLike::getStatus, LikeStatusEnum.LIKE.getValue()) - .between(DynamicLike::getCreateTime, DateTimeUtil.getBeginTimeOfDay(date), DateTimeUtil.getEndTimeOfDay(date)); - return iDynamicLikeService.count(wrapper); - } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java index cd8e111a3..cd0d3279e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java @@ -1235,13 +1235,6 @@ public class DynamicService extends CommunityBaseService { } } - public int countByUid(Long uid) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Dynamic::getUid, uid) - .eq(Dynamic::getStatus, DynamicStatusEnum.PASS.getValue()); - return iDynamicService.count(wrapper); - } - /** * 动态发布开关 */ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicTaskService.java index 2560f0d83..4fb01ae3e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicTaskService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicTaskService.java @@ -51,9 +51,9 @@ public class DynamicTaskService extends CommunityBaseService{ queryWrapper.eq("hot_change_flag", HotChangeTipEnum.UPDATE.getValue()); queryWrapper.orderByDesc("update_time"); - int total = iDynamicService.count(queryWrapper); + long total = iDynamicService.count(queryWrapper); int pageSize = 200; - int totalPage = (total - 1) / pageSize + 1; + long totalPage = (total - 1) / pageSize + 1; logger.info("updateHotValueTask, total = {}, totalPage = {}", total, totalPage); int current = 1; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java index 0cd3b86a8..914d5636a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/GoldExchangeDiamondService.java @@ -207,8 +207,8 @@ public class GoldExchangeDiamondService { if (null != clan){ QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.lambda().eq(ClanGoldExchangeRecord::getUid, uid).eq(ClanGoldExchangeRecord::getClanId, clan.getId()); - int count = clanGoldExchangeService.count(queryWrapper); - if (count < 1){ + long count = clanGoldExchangeService.count(queryWrapper); + if (count < 1L){ RLock lock = redissonClient.getLock(RedisKey.clan_gold_exchange_record_lock.getKey(uid.toString())); boolean isLocked = false; try { @@ -218,7 +218,7 @@ public class GoldExchangeDiamondService { throw new ServiceException(BusiStatus.SERVERBUSY); } count = clanGoldExchangeService.count(queryWrapper); - if (count < 1){ + if (count < 1L){ HallMember hallMember = hallService.getHallMember(uid); clanGoldExchangeService.clearClanGoldExchangeRecord(uid, clan.getId(), null != hallMember? hallMember.getHallId(): null, uid.equals(clan.getClanElderUid())? Constant.ClanRoleType.ELDER: Constant.HallRoleType.NORMAL); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java index 1b2a0e47c..4d19d6d32 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/exchange/WithdrawService.java @@ -81,7 +81,7 @@ public class WithdrawService { Date weekEnd = DateUtil.endOfWeek(now); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.between(WithdrawRecord::getCreateTime, weekStart, weekEnd).eq(WithdrawRecord::getUid, uid); - Integer weekHasTimes = recordService.count(wrapper); + int weekHasTimes = (int) recordService.count(wrapper); return Math.max(weekTimes - weekHasTimes, 0); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java index 760c44d3b..dfa1becbb 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyMemberService.java @@ -37,7 +37,7 @@ public class FamilyMemberService extends ServiceImpl= family.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -221,7 +221,7 @@ public class FamilyRelationService { } if (FamilyConstant.OptionalType.APPROVE.equals(type)) {//同意申请加入家族 - Integer memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); + long memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); if (memberNum >= family.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -298,7 +298,7 @@ public class FamilyRelationService { } } - Integer memberNum = familyMemberService.countVaildFamilyMemberByRole(familyMember.getFamilyId(), null); + long memberNum = familyMemberService.countVaildFamilyMemberByRole(familyMember.getFamilyId(), null); if (memberNum >= family.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -406,7 +406,7 @@ public class FamilyRelationService { } if (FamilyConstant.OptionalType.APPROVE.equals(type)) {//同意申请加入家族 - Integer memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); + long memberNum = familyMemberService.countVaildFamilyMemberByRole(family.getId(), null); if (memberNum >= family.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java index d2072587a..a36acdfe2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/GiftSendService.java @@ -907,7 +907,6 @@ public class GiftSendService extends BaseService { if (CollectionUtils.isNotEmpty(nonDeviationPrizeTypeList)) { wraper.or().in(LuckyBagPool::getPoolType, nonDeviationPrizeTypeList); } - return wraper; } ); return luckyBagPoolService.list(queryWrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java index f603f9492..f646b59b0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberService.java @@ -38,7 +38,7 @@ public class GuildMemberService extends ServiceImpl= guild.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -231,7 +231,7 @@ public class GuildRelationService { } if (GuildConstant.OptionalType.APPROVE.equals(type)) {//同意申请加入家族 - Integer memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); + long memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); if (memberNum >= guild.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -314,7 +314,7 @@ public class GuildRelationService { } } - Integer memberNum = guildMemberService.countVaildGuildMemberByRole(guildMember.getGuildId(), null); + long memberNum = guildMemberService.countVaildGuildMemberByRole(guildMember.getGuildId(), null); if (memberNum >= guild.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } @@ -426,7 +426,7 @@ public class GuildRelationService { } if (GuildConstant.OptionalType.APPROVE.equals(type)) {//同意申请加入家族 - Integer memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); + long memberNum = guildMemberService.countVaildGuildMemberByRole(guild.getId(), null); if (memberNum >= guild.getMemberNumLimit()){ throw new ServiceException(BusiStatus.FAMILY_MEMBER_MAX); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java index 4facf9f55..1d0fa2444 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/hall/HallSuperManagerBizService.java @@ -138,9 +138,9 @@ public class HallSuperManagerBizService { // 校验家族超管上限 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(HallSuperManage::getClanId, clan.getId()).eq(HallSuperManage::getStatus, Constant.status.valid); - int count = hallSuperManageService.count(queryWrapper); + long count = hallSuperManageService.count(queryWrapper); HallSuperManageConfigDTO config = getConfig(); - if (count + 1 > config.getMaxSuperManageCount()) { + if (count > (config.getMaxSuperManageCount() - 1)) { throw new ServiceException(BusiStatus.OVER_MAX_COUNT); } insertHallSuperManage(clan.getId(), params.getUid()); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagCollectServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagCollectServiceImpl.java index ddc539148..fb531a085 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagCollectServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/lucky/impl/LuckyBagCollectServiceImpl.java @@ -147,7 +147,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long dayStockCount = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.LIGHT_UP.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, uid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) @@ -302,7 +302,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long dayStockCount = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.ACCUMULATE.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, uid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) @@ -451,7 +451,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long count = luckyBagCollectRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRecord::getCollectType, LuckyBagCollectTypeEnum.LIGHT_UP.ordinal()) .eq(LuckyBagCollectRecord::getRecordStatus, Constant.Yes1No0.NO) .eq(LuckyBagCollectRecord::getCollectGiftId, gift.getGiftId()) @@ -475,14 +475,14 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long count = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.LIGHT_UP.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, uid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) .eq(LuckyBagCollectRewardRecord::getRewardId, reward.getRewardId()) .eq(LuckyBagCollectRewardRecord::getStartTime, actStartTimeStr) .eq(LuckyBagCollectRewardRecord::getEndTime, actEndTimeStr)); - rewardVo.setIsGet(count > 0); + rewardVo.setIsGet(count > 0L); luckyBagCollectRewardVos.add(rewardVo); } int dayLimit = rewards.stream().mapToInt(LuckyBagCollect.LuckyBagCollectReward::getRewardLimit).sum(); @@ -490,7 +490,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long drawNum = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.LIGHT_UP.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, uid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) @@ -544,7 +544,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long count = luckyBagCollectRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRecord::getCollectType, LuckyBagCollectTypeEnum.ACCUMULATE.ordinal()) .eq(LuckyBagCollectRecord::getCollectGiftId, gift.getGiftId()) .eq(LuckyBagCollectRecord::getCollectId, collectId) @@ -567,7 +567,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long count = luckyBagCollectRewardRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRewardRecord::getCollectType, LuckyBagCollectTypeEnum.ACCUMULATE.ordinal()) .eq(LuckyBagCollectRewardRecord::getUid, uid) .eq(LuckyBagCollectRewardRecord::getCollectId, collectId) @@ -575,7 +575,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpl 0); + rewardVo.setIsGet(count > 0L); luckyBagCollectRewardVos.add(rewardVo); } int dayLimit = rewards.stream().mapToInt(LuckyBagCollect.LuckyBagCollectReward::getRewardLimit).sum(); @@ -583,7 +583,7 @@ public class LuckyBagCollectServiceImpl extends ServiceImpllambdaQuery() + long drawNum = luckyBagCollectRecordService.count(Wrappers.lambdaQuery() .eq(LuckyBagCollectRecord::getCollectType, LuckyBagCollectTypeEnum.ACCUMULATE.ordinal()) .eq(LuckyBagCollectRecord::getReceiveUid, uid) .eq(LuckyBagCollectRecord::getCollectId, collectId) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java index cfe0afdbf..4b514f3e1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/miniGame/impl/MiniGameForBaiShunServiceImpl.java @@ -236,8 +236,8 @@ public class MiniGameForBaiShunServiceImpl implements MiniGameForBaiShunService } //todo cache //新增轮次 - int count = miniGameRoundService.count(Wrappers.lambdaQuery().eq(MiniGameRound::getRoundId, gameRoundId)); - if (count == 0) { + long count = miniGameRoundService.count(Wrappers.lambdaQuery().eq(MiniGameRound::getRoundId, gameRoundId)); + if (count >= 0L) { MiniGameRound miniGameRound = new MiniGameRound(); miniGameRound.setRoomUid(roomUid); miniGameRound.setLeaderUid(uid); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java index 4de663631..62968c986 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/newbie/NewbieMessageRecordService.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; @Service public class NewbieMessageRecordService extends ServiceImpl { - public Integer getHelloUidCount(Long helloUid) { + public long getHelloUidCount(Long helloUid) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(NewbieMessageRecord::getHelloUid, helloUid); return count(wrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/PrizeDateExcludeUserService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/PrizeDateExcludeUserService.java index 14143a52f..d27dbbb1a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/PrizeDateExcludeUserService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/prize/PrizeDateExcludeUserService.java @@ -31,8 +31,7 @@ public class PrizeDateExcludeUserService { query.lambda().le(PrizeDataExcludeUser::getBeginDateTime,now) .ge(PrizeDataExcludeUser::getEndDateTime, now) .eq(PrizeDataExcludeUser::getUserId, uid); - Integer count = prizeDataExcludeUserMapper.selectCount(query); - - return count > 0; + long count = prizeDataExcludeUserMapper.selectCount(query); + return count > 0L; } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java index 7b462aae0..d25e1e1d3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeBackService.java @@ -18,8 +18,8 @@ public class RedEnvelopeBackService extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(RedEnvelopeBack::getRedEnvelopeId, redEnvelopeId); - Integer count = redEnvelopeBackMapper.selectCount(wrapper); - return count > 0; + long count = redEnvelopeBackMapper.selectCount(wrapper); + return count > 0L; } public void backRecord(Long redEnvelopeId, Long calculateBackGold) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeItemService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeItemService.java index edf9f5bca..d8d968136 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeItemService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeItemService.java @@ -36,7 +36,7 @@ public class RedEnvelopeItemService extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().eq(RedEnvelopeItem::getRedEnvelopeId, redEnvelopeId); return redEnvelopeItemMapper.selectCount(wrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeService.java index 289fb6947..604b4042f 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/RedEnvelopeService.java @@ -109,7 +109,7 @@ public class RedEnvelopeService extends ServiceImpllambdaQuery() + long count = count(Wrappers.lambdaQuery() .le(RedEnvelopeRain::getStartTime, now) .ge(RedEnvelopeRain::getEndTime, now)); - if (count == 0) { + if (count <= 0L) { return; } String redEnvelopeJson = jedisService.lpop(RedisKey.red_envelope_rain_list.getKey(String.valueOf(roomUid))); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/IRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/IRedEnvelopeStrategy.java index b4b9accfd..3406dc5e6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/IRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/IRedEnvelopeStrategy.java @@ -202,9 +202,9 @@ public abstract class IRedEnvelopeStrategy { protected Double calculateOpenAmount(Long redEnvelopeId) { Double unOpenAmount = redEnvelopeService.unOpenAmount(redEnvelopeId); - Integer unPickNum = redEnvelopeService.unPickNum(redEnvelopeId); + long unPickNum = redEnvelopeService.unPickNum(redEnvelopeId); log.info("unOpenAmount : " + unOpenAmount + ", unPickNum : " + unPickNum); - return OpenRedEnvelopeUtil.openDiamond(unOpenAmount, unPickNum.longValue()); + return OpenRedEnvelopeUtil.openDiamond(unOpenAmount, unPickNum); } protected RedEnvelope getRedEnvelope(Long redEnvelopeId) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java index 053d7469a..7e4e56a8c 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/RedEnvelopeStrategy.java @@ -151,7 +151,7 @@ public abstract class RedEnvelopeStrategy { /** * 未开红包个数 */ - public int unOpenCount(long redEnvelopeId) { + public long unOpenCount(long redEnvelopeId) { RedEnvelopeService redEnvelopeService = SpringContextHolder.getBean(RedEnvelopeService.class); return redEnvelopeService.unPickNum(redEnvelopeId); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGiftRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGiftRedEnvelopeStrategy.java index 14cb10920..91866c21e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGiftRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGiftRedEnvelopeStrategy.java @@ -81,8 +81,8 @@ public class InRoomGiftRedEnvelopeStrategy extends RedEnvelopeStrategy { @Override public double calculateOpenAmount(long redEnvelopeId) { double unOpenAmount = unOpenAmount(redEnvelopeId); - int unOpenCount = unOpenCount(redEnvelopeId); - return OpenRedEnvelopeUtil.openGift((long) unOpenAmount, (long) unOpenCount); + long unOpenCount = unOpenCount(redEnvelopeId); + return OpenRedEnvelopeUtil.openGift((long) unOpenAmount, unOpenCount); } @Override diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java index 8c2c934f4..a5bdc5355 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/redenvelope/strategy/sendandopen/impl/InRoomGoldRedEnvelopeStrategy.java @@ -96,8 +96,8 @@ public class InRoomGoldRedEnvelopeStrategy extends RedEnvelopeStrategy { @Override public double calculateOpenAmount(long redEnvelopeId) { double unOpenAmount = super.unOpenAmount(redEnvelopeId); - int unOpenCount = super.unOpenCount(redEnvelopeId); - return OpenRedEnvelopeUtil.openDiamond(unOpenAmount, (long) unOpenCount); + long unOpenCount = super.unOpenCount(redEnvelopeId); + return OpenRedEnvelopeUtil.openDiamond(unOpenAmount, unOpenCount); } @Override diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/CrossRoomPkRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/CrossRoomPkRecordService.java index 148eef092..82bd56df6 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/CrossRoomPkRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/CrossRoomPkRecordService.java @@ -29,7 +29,7 @@ public interface CrossRoomPkRecordService extends IService { CrossRoomPkRecord acceptRoom, Long acceptRoomUid, Date beginTime, Date actualEndTime); - int countRecordByRoomUidAndStatus(Long roomUid, Byte status); + long countRecordByRoomUidAndStatus(Long roomUid, Byte status); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/IBlindDateRoundConnectionSuccessService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/IBlindDateRoundConnectionSuccessService.java index 8e6a7cc11..2e6d410bf 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/IBlindDateRoundConnectionSuccessService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/IBlindDateRoundConnectionSuccessService.java @@ -10,7 +10,6 @@ */ package com.accompany.business.service.room; -import com.accompany.business.dto.blindDate.BlindDateRoundConnectionSuccessDTO; import com.accompany.business.model.room.BlindDateRoundConnectionSuccess; import com.baomidou.mybatisplus.extension.service.IService; @@ -27,5 +26,5 @@ import java.util.List; public interface IBlindDateRoundConnectionSuccessService extends IService { List listBlindDateRoundConnectionSuccessByPage(Integer page, Integer pageSize, Date startTime, Date endDateTime); - Integer countBlindDateRoundConnectionSuccess(Date startTime, Date endDateTime); + long countBlindDateRoundConnectionSuccess(Date startTime, Date endDateTime); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RobotUsingService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RobotUsingService.java index 0279c6445..58cc75a7a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RobotUsingService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RobotUsingService.java @@ -40,7 +40,7 @@ public class RobotUsingService extends ServiceImpl return list(wrapper); } - public Integer getRoomRobotNum(Long roomUid) { + public long getRoomRobotNum(Long roomUid) { QueryWrapper wrapper = new QueryWrapper(); wrapper.lambda().eq(RobotUsing::getRoomUid, roomUid); return count(wrapper); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java index 40b932d9a..e6ebbcfb4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBackgroundService.java @@ -213,11 +213,11 @@ public class RoomBackgroundService extends ServiceImpl= 6){ + if (customCount >= 6L){ throw new ServiceException(BusiStatus.ROOM_BACKGROUND_CUSTOM_COUNT_OVER_LIMIT); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForMiniGameService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForMiniGameService.java index 97fa87cad..73a791021 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForMiniGameService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomForMiniGameService.java @@ -265,9 +265,9 @@ public class RoomForMiniGameService extends AbstractRoomService { throw new ServiceException(BusiStatus.SERVERBUSY); } try { - int count = miniGameRoomService.count(Wrappers.lambdaQuery() + long count = miniGameRoomService.count(Wrappers.lambdaQuery() .eq(MiniGameRoom::getRoomUid, roomUid)); - if (count == 0) { + if (count <= 0) { //第一次创建房间 log.info("创建房间{}为小游戏房", roomUid); MiniGameRoom miniGameRoom = new MiniGameRoom(); @@ -298,7 +298,7 @@ public class RoomForMiniGameService extends AbstractRoomService { } } else { log.info("房间{}本不是小游戏房,更新为小游戏{}房", roomUid, newMgId); - int miniGameCount = miniGameRoomService.count(Wrappers.lambdaQuery() + long miniGameCount = miniGameRoomService.count(Wrappers.lambdaQuery() .eq(MiniGameRoom::getRoomUid, roomUid)); if (miniGameCount > 0) { miniGameRoomService.updateStateByRoomUid(Constant.MiniGameRoomState.wait, roomUid, prevRoomType); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateRoundConnectionSuccessServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateRoundConnectionSuccessServiceImpl.java index af7cb11c8..6f4b734f0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateRoundConnectionSuccessServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/BlindDateRoundConnectionSuccessServiceImpl.java @@ -53,6 +53,6 @@ public class BlindDateRoundConnectionSuccessServiceImpl implements BlindDateRoun @Override public long total(Date startTime, Date endDateTime) { - return iBlindDateRoundConnectionSuccessService.countBlindDateRoundConnectionSuccess(startTime, endDateTime).longValue(); + return iBlindDateRoundConnectionSuccessService.countBlindDateRoundConnectionSuccess(startTime, endDateTime); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRecordServiceImpl.java index 9223047cf..27fdb5568 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRecordServiceImpl.java @@ -107,7 +107,7 @@ public class CrossRoomPkRecordServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(CrossRoomPkRecord::getRoomUid, roomUid) .eq(CrossRoomPkRecord :: getStatus, status); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java index 6161419f4..daa44a3b1 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/CrossRoomPkRoundServiceImpl.java @@ -518,8 +518,8 @@ public class CrossRoomPkRoundServiceImpl extends ServiceImpl 0) { + long waitCount = crossRoomPkRecordService.countRecordByRoomUidAndStatus(inviteUid, CrossRoomRecordStatusEnum.WAIT.getValue()); + if (waitCount > 0L) { throw new ServiceException(BusiStatus.INITIATED_BUT_NOT_RESPONDED_BY_THE_OTHER_PARTY_PLEASE_WAIT_UNTIL_LATER_TO_INITIATE); } if (inviteRoomInPK) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/IBlindDateRoundConnectionSuccessServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/IBlindDateRoundConnectionSuccessServiceImpl.java index f8475caf5..8c4ccd4e3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/IBlindDateRoundConnectionSuccessServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/IBlindDateRoundConnectionSuccessServiceImpl.java @@ -51,7 +51,7 @@ public class IBlindDateRoundConnectionSuccessServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.lambda().le(BlindDateRoundConnectionSuccess::getCreateTime, endDateTime) .ge(BlindDateRoundConnectionSuccess::getCreateTime, startTime); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java index 22595a867..4dc737305 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserInRoomService.java @@ -162,7 +162,7 @@ public class UserInRoomService { if (uid == null || roomUid == null) { return; } - Integer count = userInRoomRecordMapper.selectCount(Wrappers.lambdaQuery() + long count = userInRoomRecordMapper.selectCount(Wrappers.lambdaQuery() .eq(UserInRoomRecord::getRoomUid, roomUid) .eq(UserInRoomRecord::getUid, uid)); Date now = new Date(); @@ -171,7 +171,7 @@ public class UserInRoomService { .uid(uid) .roomUid(roomUid) .behaveType(behaveType) - .isFirst(count == 0 ? Constant.Yes1No0.YES : Constant.Yes1No0.NO) + .isFirst(count == 0L ? Constant.Yes1No0.YES : Constant.Yes1No0.NO) .createTime(now) .updateTime(now) .build(); @@ -236,8 +236,8 @@ public class UserInRoomService { //没有查询数据库检查 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(RoomVisitorUserDict::getUid, uid); - Integer count = roomVisitorUserDictMapper.selectCount(queryWrapper); - if (count > 0) { + long count = roomVisitorUserDictMapper.selectCount(queryWrapper); + if (count > 0L) { jedisService.setex(RedisKey.room_visitor_user_exit_flag.getKey(String.valueOf(uid)), 24 * 60 * 60, String.valueOf(1)); return; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserVisitRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserVisitRecordService.java index 098a8a0a8..3c2682a09 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserVisitRecordService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/UserVisitRecordService.java @@ -22,7 +22,7 @@ public interface UserVisitRecordService extends IService { /** * 获取用户访客数量 */ - Integer getUserVisitNum(Long uid); + long getUserVisitNum(Long uid); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserVisitRecordServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserVisitRecordServiceImpl.java index b3c5522b8..29167f2f9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserVisitRecordServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/user/impl/UserVisitRecordServiceImpl.java @@ -91,13 +91,12 @@ public class UserVisitRecordServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - Integer dayLimit = Integer.valueOf(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.VISIT_RECORD_DAY_LIMIT, String.valueOf(-7))); + int dayLimit = Integer.parseInt(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.VISIT_RECORD_DAY_LIMIT, String.valueOf(-7))); Date minDate = DateTimeUtil.getZeroTimeByDate(DateTimeUtil.addDays(new Date(), dayLimit)); wrapper.lambda().eq(UserVisitRecord::getUid, uid).ge(UserVisitRecord::getCreateTime, minDate).orderByDesc(UserVisitRecord::getCreateTime); - Integer visitNum = count(wrapper); - return visitNum; + return count(wrapper); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java index f94fb5802..c3d6e1a60 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/withdraw/impl/WithdrawUserAccountServiceImpl.java @@ -104,8 +104,8 @@ public class WithdrawUserAccountServiceImpl extends ServiceImpllambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); - if (count > 0) { + long count = count(Wrappers.lambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); + if (count > 0L) { throw new ServiceException(BusiStatus.THE_WITHDRAWAL_METHOD_HAS_BEEN_ADDED); } int updateNum = 1; @@ -161,8 +161,8 @@ public class WithdrawUserAccountServiceImpl extends ServiceImpllambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); - if (count == 0) { + long count = withdrawUserAccountService.count(Wrappers.lambdaQuery().eq(WithdrawUserAccount::getUid, uid).eq(WithdrawUserAccount::getAccountType, accountType)); + if (count <= 0L) { throw new ServiceException(BusiStatus.ILLEGAL_ACCOUNT); } List accountDtls = withdrawAccountDtlService.list(Wrappers.lambdaQuery().eq(WithdrawAccountDtl::getAccountType, accountType)); @@ -347,12 +347,12 @@ public class WithdrawUserAccountServiceImpl extends ServiceImpllambdaQuery() + long count = withdrawUserRecordService.count(Wrappers.lambdaQuery() .eq(WithdrawUserRecord::getUid, uid) .eq(WithdrawUserRecord::getRecordStatus, RecordStatusEnum.PASS.ordinal()) .between(WithdrawUserRecord::getCreateTime, monday, now)); Integer weekLimitCount = withdrawConfig.getWeekLimitCount(); - withdrawConfig.setWeekLimitCount(weekLimitCount - count); + withdrawConfig.setWeekLimitCount((int) (weekLimitCount - count)); return withdrawConfig; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java index b53ad4493..c43d923c2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/world/WorldTypeService.java @@ -75,8 +75,8 @@ public class WorldTypeService extends BaseService { WorldQuery worldQuery = new WorldQuery(); worldQuery.setWorldTypeId(valid.getId()); worldQuery.setStatus(WorldConstant.STATUS_VALID); - int count = iWorldService.count(worldQuery); - if(count > 0) { + long count = iWorldService.count(worldQuery); + if(count > 0L) { list.add(valid); } } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java index 2364db715..a28f80634 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/user/UsersController.java @@ -160,7 +160,7 @@ public class UsersController extends BaseController { } // 获取用户访客数量 - Integer userVisitNum = userVisitRecordService.getUserVisitNum(uid); + long userVisitNum = userVisitRecordService.getUserVisitNum(uid); userVo.setVisitNum(userVisitNum); Integer userInRoomNum = userInRoomService.getUserInRoomNum(uid); userVo.setInRoomNum(userInRoomNum); diff --git a/accompany-business/accompany-business-web/src/test/java/servicetest/CrossRoomPkTest.java b/accompany-business/accompany-business-web/src/test/java/servicetest/CrossRoomPkTest.java deleted file mode 100644 index 9c3bbbb58..000000000 --- a/accompany-business/accompany-business-web/src/test/java/servicetest/CrossRoomPkTest.java +++ /dev/null @@ -1,312 +0,0 @@ -package servicetest; - -import com.accompany.business.constant.CrossRoomRecordStatusEnum; -import com.accompany.business.dto.CrossRoomPkNotifyDto; -import com.accompany.business.dto.CrossRoomPkPanelDto; -import com.accompany.business.dto.CrossRoomPkValidDto; -import com.accompany.business.model.room.CrossRoomPkRecord; -import com.accompany.business.mybatismapper.room.CrossRoomPkRecordMapper; -import com.accompany.common.netease.ErBanNetEaseService; -import com.accompany.business.service.firstpage.FirstPageBannerService; -import com.accompany.business.service.home.HomeService; -import com.accompany.business.service.room.CrossRoomPkRecordService; -import com.accompany.business.service.room.CrossRoomPkRoundService; -import com.accompany.business.service.room.RoomService; -import com.accompany.business.service.user.UsersService; -import com.accompany.business.strategy.DealOverdueRedisKeyStrategyI; -import com.accompany.business.strategy.RedisKeyOverdueDealProxy; -import com.accompany.business.strategy.RedisKeyOverdueHandlerFactory; -import com.accompany.business.vo.firstpage.FirstPageBannerVo; -import com.accompany.business.vo.home.PlayRoomVo; -import com.accompany.business.vo.roomtab.TopRoomTabHomeVo; -import com.accompany.common.constant.Attach; -import com.accompany.common.constant.Constant; -import com.accompany.common.device.DeviceInfo; -import com.accompany.common.netease.neteaseacc.result.RoomRet; -import com.accompany.common.redis.RedisKey; -import com.accompany.common.status.BusiStatus; -import com.accompany.common.utils.DateTimeUtil; -import com.accompany.common.utils.UUIDUtil; -import com.accompany.core.enumeration.I18nAlertEnum; -import com.accompany.core.exception.ServiceException; -import com.accompany.core.model.Account; -import com.accompany.core.model.Room; -import com.accompany.core.model.Users; -import com.accompany.core.service.SysConfService; -import com.accompany.core.service.account.AccountService; -import com.accompany.core.util.I18NMessageSourceUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.gson.Gson; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -public class CrossRoomPkTest extends CommonTest { - - @Autowired - private RedisKeyOverdueHandlerFactory redisKeyOverdueHandlerFactory; - @Autowired - private RedisKeyOverdueDealProxy redisKeyOverdueDealProxy; - - @Autowired - private UsersService usersService; - - @Autowired - private RoomService roomService; - - @Autowired - private ErBanNetEaseService erBanNetEaseService; - - @Autowired - private CrossRoomPkRecordService crossRoomPkRecordService; - - @Autowired - private SysConfService sysConfService; - - @Autowired - private HomeService homeService; - - @Autowired - private FirstPageBannerService firstPageBannerService; - - @Autowired - private AccountService accountService; - - @Autowired - private CrossRoomPkRecordMapper crossRoomPkRecordMapper; - - - - - @Autowired - private CrossRoomPkRoundService crossRoomPkRoundService; - - - protected Gson gson = new Gson(); - - @Test - public void redisKeyOverdueTest() { - String key = RedisKey.cross_room_ttl_auto_deny.getKey(String.valueOf(13)); - - DealOverdueRedisKeyStrategyI strategyI = redisKeyOverdueHandlerFactory.getStrategy(key); - if (strategyI == null) return; - - //此处策略不为空，即可表明过期的key一定是需要监听的某个key - redisKeyOverdueDealProxy.dealInvoke(key, strategyI); - System.out.println("结束测试..."); - } - - @Test - public void sengMsgToRoomTest() throws Exception { - Room acceptRoom = roomService.getRoomByUid(1004419l); - Room inviteRoom = roomService.getRoomByUid(1000429l); - - CrossRoomPkPanelDto panelDto = new CrossRoomPkPanelDto(); - panelDto.setInit(true); - panelDto.setBeginTime(new Date().getTime()); - - panelDto.setcUid(acceptRoom.getUid()); - panelDto.setcTitle(acceptRoom.getTitle()); - panelDto.setcAvatar(acceptRoom.getAvatar()); - panelDto.setcAmount(0l); - panelDto.setcPercent("0"); - panelDto.setCsRank(Collections.EMPTY_LIST); - panelDto.setCrRank(Collections.EMPTY_LIST); - - panelDto.setaUid(inviteRoom.getUid()); - panelDto.setaTitle(inviteRoom.getTitle()); - panelDto.setaAvatar(inviteRoom.getAvatar()); - panelDto.setaAmount(0l); - panelDto.setaPercent("0"); - panelDto.setAsRank(Collections.EMPTY_LIST); - panelDto.setArRank(Collections.EMPTY_LIST); - - panelDto.setAllAmount(0l); - crossRoomPkRoundService.sendPanelMsg(acceptRoom.getRoomId(), acceptRoom.getUid(), panelDto); - - /*InviteParam inviteParam = new InviteParam(); - inviteParam.setInviteUid(938286l); - inviteParam.setDuration(10); - inviteParam.setPlayDesc("教你耍耍"); - crossRoomPkRoundService.crossRoomPkInviteMsg(451482606l, inviteParam, Constant.DefineProtocol.CROSS_ROOM_PK_MSG, Constant.DefineProtocol.CROSS_ROOM_PK_DELIVE_MSG);*/ - System.out.println("结束测试..."); - } - - @Test - public void sendCrossRoomPkResultMsgTest() throws Exception { - Room room = roomService.getRoomByUid(938286l); - Room winRoom = roomService.getRoomByUid(1003696l); - Room anotherRoom = roomService.getRoomByUid(1003696l); - - String msg = I18NMessageSourceUtil.getMessage(I18nAlertEnum.CROSS_ROOM_PK_ROOM_NOTIFY_MSG, new Object[]{winRoom.getTitle()}, winRoom.getUid()); - - Users winUsers = usersService.getUsersByUid(winRoom.getUid()); - Users anotherUsers = usersService.getUsersByUid(anotherRoom.getUid()); - - Attach attach=new Attach(); - attach.setFirst(Constant.DefineProtocol.CROSS_ROOM_PK_MSG); - attach.setSecond(Constant.DefineProtocol.CROSS_ROOM_PK_RESULT_MSG); - - JSONObject jsonObject = new JSONObject(); - //获胜方房间uid - jsonObject.put("winUid", winRoom.getUid()); - //获胜方房间名称 - jsonObject.put("winTitle", winRoom.getTitle()); - //获胜方房间头像 - jsonObject.put("winAvatar", winUsers.getAvatar()); - - //另一方房间uid - jsonObject.put("failUid", anotherRoom.getUid()); - //另一方房间名称 - jsonObject.put("failTitle", anotherRoom.getTitle()); - //另一方房间头像 - jsonObject.put("failAvatar", anotherUsers.getAvatar()); - //消息内容 - jsonObject.put("msg", msg); - attach.setData(jsonObject); - - String attachStr=gson.toJson(attach); - - erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1); - //room = roomService.getRoomByUid(938286l); - //erBanNetEaseService.sendChatRoomMsg(room.getRoomId(), UUIDUtil.get(), room.getUid().toString(), Constant.DefineProtocol.CUSTOM_MESS_DEFINE, attachStr, 1); - - - System.out.println("结束测试..."); - } - - @Test - public void dealAcceptOrDenyPkRecordTest() { - int num = crossRoomPkRecordService.dealAcceptOrDenyPkRecord(6l, CrossRoomRecordStatusEnum.WAIT.getValue(), CrossRoomRecordStatusEnum.DENY.getValue(), null); - System.out.println(num); - } - - @Test - public void crossRoomPkConfigTest() { - CrossRoomPkValidDto crossRoomPkValidDto = new CrossRoomPkValidDto(); - String validDotStr = sysConfService.getSysConfValueById(Constant.SysConfId.CROSS_ROOM_VALID_PK); - - CrossRoomPkValidDto configDto = gson.fromJson(validDotStr, CrossRoomPkValidDto.class); - - String notifyStr = sysConfService.getSysConfValueById(Constant.SysConfId.CROSS_ROOM_PK_NOTIFY); - CrossRoomPkNotifyDto crossRoomPkNotifyDto = gson.fromJson(notifyStr, CrossRoomPkNotifyDto.class); - System.out.println("结束测试..."); - } - - - @Test - public void pkStatusCheck() { - List playRoomVos = new ArrayList<>(); - PlayRoomVo playRoomVo1 = new PlayRoomVo(); - playRoomVo1.setRoomId(460262720l); - PlayRoomVo playRoomVo2 = new PlayRoomVo(); - playRoomVo2.setRoomId(460443070l); - playRoomVos.add(playRoomVo1); - playRoomVos.add(playRoomVo2); - homeService.checkIsCrossPking(playRoomVos, homeService::checkHomePlayIsCrossPking); - - - List list = new ArrayList<>(); - TopRoomTabHomeVo tabHomeVo1 = new TopRoomTabHomeVo(); - tabHomeVo1.setRoomUid(1004960l); - TopRoomTabHomeVo tabHomeVo2 = new TopRoomTabHomeVo(); - tabHomeVo2.setRoomUid(1004906l); - list.add(tabHomeVo1); - list.add(tabHomeVo2); - homeService.checkIsCrossPking(list, homeService::checkTopRoomTabIsCrossPking); - - - System.out.println("结束测试..."); - } - - @Test - public void checkRoomIsCrossPkTest() { - Long roomUid1 = 1004803l; - byte type1 = 1; - Boolean aBoolean = crossRoomPkRecordService.checkRoomIsCrossPk(roomUid1, type1); - Long roomUid2 = 1004734l; - byte type2 = 2; - Boolean aBoolean1 = crossRoomPkRecordService.checkRoomIsCrossPk(roomUid2, type2); - System.out.println("结束..."); - } - - @Test - public void dealInvokeTest() { - String key = "yinyou_cross_room_ttl_auto_deny_22"; - DealOverdueRedisKeyStrategyI strategyI = redisKeyOverdueHandlerFactory.getStrategy(key); - redisKeyOverdueDealProxy.dealInvoke(key, strategyI); - System.out.println("结束..."); - } - - @Test - public void roomDeal() throws Exception { - Room currentRoom = roomService.getRoomByUid(1005052l); - Room anotherRoom = roomService.getRoomByUid(1005055l); - - //结束恢复到普通模式 - currentRoom.setRoomModeType(Constant.RoomModeType.NORMAL_MODE); - anotherRoom.setRoomModeType(Constant.RoomModeType.NORMAL_MODE); - RoomRet roomRet = crossRoomPkRoundService.updateDbAndNetease(currentRoom); - if (roomRet.getCode() != 200) { - throw new ServiceException(BusiStatus.ROOM_STATUS_CHANGE_FAILED); - } - roomRet = crossRoomPkRoundService.updateDbAndNetease(anotherRoom); - if (roomRet.getCode() != 200) { - throw new ServiceException(BusiStatus.ROOM_STATUS_CHANGE_FAILED); - } - } - - - @Test - public void getFirstPageBannerTest() { - Long erbanNo = 3636257l; - - Account account = accountService.getAccountByErBanNo(erbanNo); - - DeviceInfo deviceInfo = gson.fromJson(account.getDeviceInfo(), DeviceInfo.class); - List bannerVoList1 = firstPageBannerService.getFirstPageBanner(1, deviceInfo, account.getUid()); - List bannerVoList2 = firstPageBannerService.getFirstPageBanner(1, deviceInfo, account.getUid()); - List bannerVoList3 = firstPageBannerService.getFirstPageBanner(1, deviceInfo, account.getUid()); - List bannerVoList4 = firstPageBannerService.getFirstPageBanner(1, deviceInfo, account.getUid()); - List bannerVoList5 = firstPageBannerService.getFirstPageBanner(1, deviceInfo, account.getUid()); - System.out.println("结束..."); - } - - - @Test - public void crossPkTimeQueryTest() { - Page page = new Page<>(1, 10); - - Integer dayLimit = Integer.valueOf(sysConfService.getDefaultSysConfValueById(Constant.SysConfId.VISIT_RECORD_DAY_LIMIT, String.valueOf(-100))); - Date minDate = DateTimeUtil.getZeroTimeByDate(DateTimeUtil.addDays(new Date(), dayLimit)); - - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(CrossRoomPkRecord::getRoomUid, 1005042l).ge(CrossRoomPkRecord::getCreateTime, minDate).orderByDesc(CrossRoomPkRecord::getCreateTime); - - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.lambda().eq(CrossRoomPkRecord::getRoomUid, 1005042l).ge(CrossRoomPkRecord::getCreateTime, minDate).orderByDesc(CrossRoomPkRecord::getCreateTime).groupBy(); - - - - IPage crossList = crossRoomPkRecordMapper.selectPage(page, queryWrapper); - IPage crossList1 = crossRoomPkRecordMapper.selectPage(page, queryWrapper1); - System.out.println("结束..."); - } - - - - - - - - - -} diff --git a/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/IWorldService.java b/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/IWorldService.java index 3eb055989..810e0f994 100644 --- a/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/IWorldService.java +++ b/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/IWorldService.java @@ -5,7 +5,6 @@ import com.accompany.world.query.WorldQuery; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Collection; import java.util.List; import java.util.Set; @@ -36,10 +35,11 @@ public interface IWorldService extends IService { /** * 统计数量 + * * @param worldQuery * @return */ - int count(WorldQuery worldQuery); + long count(WorldQuery worldQuery); /** * 查找话题 diff --git a/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/impl/WorldServiceImpl.java b/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/impl/WorldServiceImpl.java index 59a5d94a3..b385200cf 100644 --- a/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/impl/WorldServiceImpl.java +++ b/accompany-business/accompany-business-world/accompany-business-world-service/src/main/java/com/accompany/world/service/impl/WorldServiceImpl.java @@ -77,7 +77,7 @@ public class WorldServiceImpl extends ServiceImpl implements } @Override - public int count(WorldQuery worldQuery) { + public long count(WorldQuery worldQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); if(null != worldQuery.getStatus()) { queryWrapper.eq("`status`", worldQuery.getStatus()); diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 5e21c9df4..5b9a1241c 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -52,7 +52,7 @@ 0.9.1 3.10.3 2.4.2 - 5.1.8 + 6.1.0 2.0.1.Final 1.1.0 1.3 @@ -60,7 +60,7 @@ 1.5.4 2.0.1.RELEASE 1.2.0 - 3.1.2 + 3.5.9 1.0.4 3.38.0 3.3.2 @@ -667,7 +667,13 @@ com.baomidou - mybatis-plus + mybatis-plus-boot-starter + ${mybatisplus.version} + + + + com.baomidou + mybatis-plus-jsqlparser ${mybatisplus.version} diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java index fb91a2d9a..fb86d8638 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/account/AccountManageService.java @@ -183,12 +183,12 @@ public class AccountManageService { RepeatedDeviceIpRegisterLimitConfig repeatedConfig = getRepeatedDeviceIpLimitConfig(); if (repeatedConfig.isOpen()) { - int repeatedDeviceNum = accountService.lambdaQuery().eq(Account::getDeviceId, deviceId).count(); + long repeatedDeviceNum = accountService.lambdaQuery().eq(Account::getDeviceId, deviceId).count(); if (repeatedDeviceNum >= repeatedConfig.getRepeatedDeviceNumLimit()) { throw new CustomOAuth2Exception(CustomOAuth2Exception.SIGN_IP_TO_OFTEN, BusiStatus.REGISTER_FREQUENT.getReasonPhrase()); } - int repeatedIpNum = accountService.lambdaQuery().eq(Account::getRegisterIp, ipAddress).count(); + long repeatedIpNum = accountService.lambdaQuery().eq(Account::getRegisterIp, ipAddress).count(); if (repeatedIpNum >= repeatedConfig.getRepeatedIpNumLimit()) { throw new CustomOAuth2Exception(CustomOAuth2Exception.SIGN_IP_TO_OFTEN, BusiStatus.REGISTER_FREQUENT.getReasonPhrase()); } @@ -197,7 +197,7 @@ public class AccountManageService { //当日单个ip注册数 DayIpMaxRegisterLimitConfig config = getIpMaxLimitConfig(); if (config.getOpen()) { - int count = accountService.getRegisterIpCountByOneDay(ipAddress); + long count = accountService.getRegisterIpCountByOneDay(ipAddress); if (count >= config.getMax()) { throw new CustomOAuth2Exception(CustomOAuth2Exception.SIGN_IP_TO_OFTEN, BusiStatus.REGISTER_FREQUENT.getReasonPhrase()); } @@ -311,8 +311,8 @@ public class AccountManageService { } } - int count = accountService.countByPhone(phone); - if (count > 1) { + long count = accountService.countByPhone(phone); + if (count > 1L) { throw new ServiceException(BusiStatus.PHONE_BIND_TOO_MANY_ACCOUNT); } diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/ticket/TicketServices.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/ticket/TicketServices.java index d2dfc2cce..c170ecd97 100644 --- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/ticket/TicketServices.java +++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/ticket/TicketServices.java @@ -150,8 +150,8 @@ public class TicketServices implements InitializingBean { public void saveLoginRecord(Long uid, String ipAddress, DeviceInfo deviceInfo) { Optional.ofNullable(uid).ifPresent(id -> { userAppService.updateCurrentApp(uid, deviceInfo.getApp(), new Date(), ipAddress, deviceInfo.getAppVersion()); - int count = loginRecordService.countLoginRecordToday(id); - if (count == 0) { + long count = loginRecordService.countLoginRecordToday(id); + if (count <= 0L) { Account account = accountService.getById(id); Optional.ofNullable(account).ifPresent(acc -> { AccountLoginRecord record = myUserDetailsService.buildAccountLoginRecord(ipAddress, acc, LoginTypeEnum.TICKET.getValue(), deviceInfo, null); diff --git a/xuanyin-flow-team/xuanyin-flow-team-service/src/main/java/com/xuanyin/flowteam/service/FlowTeamMemberService.java b/xuanyin-flow-team/xuanyin-flow-team-service/src/main/java/com/xuanyin/flowteam/service/FlowTeamMemberService.java index 735cd865b..90cb4f69b 100644 --- a/xuanyin-flow-team/xuanyin-flow-team-service/src/main/java/com/xuanyin/flowteam/service/FlowTeamMemberService.java +++ b/xuanyin-flow-team/xuanyin-flow-team-service/src/main/java/com/xuanyin/flowteam/service/FlowTeamMemberService.java @@ -37,7 +37,7 @@ public class FlowTeamMemberService extends ServiceImpl query = new QueryWrapper<>(); query.lambda().eq(FlowTeamMember::getTeamId, teamId) .eq(FlowTeamMember::getMemberStatus, FlowTeamConstant.MemberStatus.MEMBER_STATUS_VALID);