From 49a5edf0e63633ec500061f9a5d66a2f8a2aeaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Fri, 10 May 2024 10:51:46 +0800 Subject: [PATCH] 123 --- .../main/java/com/ruoyi/job/EveryDaysJob.java | 2 +- .../src/main/java/com/ruoyi/job/RankJob.java | 21 +++++++++++++++++++ .../src/main/java/com/ruoyi/op/BusOp.java | 2 +- .../controller/cai/app/IndexController.java | 9 ++++++++ .../com/ruoyi/cai/manager/HomeManager.java | 9 +++++++- .../com/ruoyi/cai/service/DynamicService.java | 1 - .../cai/service/impl/DynamicServiceImpl.java | 1 - .../service/impl/SmsVerifyServiceImpl.java | 2 +- .../cai/service/impl/UserServiceImpl.java | 2 ++ .../ruoyi/common/core/domain/PageQuery.java | 14 +++++++++++++ 10 files changed, 57 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java index fc68243c..a2367742 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/EveryDaysJob.java @@ -16,7 +16,7 @@ public class EveryDaysJob { public void run() { try { log.info("执行用户VIP状态码回转-开始"); - busOp.refreshUserVipStatus(); +// busOp.refreshUserVipStatus(); }catch (Exception e){ log.error("执行用户VIP状态码回转-失败!",e); }finally { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java index b723af1b..30cbb8a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/RankJob.java @@ -39,41 +39,59 @@ public class RankJob { LocalDate now = LocalDate.now(); LocalDate date = now.plusDays(-1); try { + log.info("保存魅力 日榜开始执行"); rankService.saveDayRank(date,1); } catch (Exception e) { log.error("保存魅力 日榜失败", e); + } finally { + log.info("保存魅力 日榜结束执行"); } try { + log.info("保存邀请 日榜开始执行"); rankService.saveDayRank(date,2); } catch (Exception e) { log.error("保存邀请 日榜失败", e); + } finally { + log.info("保存邀请 日榜结束执行"); } DayOfWeek week = now.getDayOfWeek(); if (week.getValue() == 1) { // 今天是周一 做一下持久化 LocalDate lastWeekDate = now.plusDays(-7); try { + log.info("保存魅力 周榜开始执行"); rankService.saveWeekRank(lastWeekDate,1); } catch (Exception e) { log.error("保存魅力 周榜失败", e); + } finally { + log.info("保存魅力 周榜结束执行"); } try { + log.info("保存邀请 周榜开始执行"); rankService.saveWeekRank(lastWeekDate,2); } catch (Exception e) { log.error("保存邀请 周榜失败", e); + } finally { + log.info("保存邀请 周榜结束执行"); } } int month = now.getDayOfMonth(); if (month == 1) { // 昨天是1号 LocalDate lastMonthDate = now.plusMonths(-1); try { + log.info("保存魅力 月榜开始执行"); rankService.saveMonthRank(lastMonthDate,1); } catch (Exception e) { log.error("保存魅力 月榜失败", e); + } finally { + log.info("保存魅力 月榜结束执行"); } try { + log.info("保存邀请 月榜开始执行"); rankService.saveMonthRank(lastMonthDate,2); } catch (Exception e) { log.error("保存邀请 月榜失败", e); + } finally { + log.info("保存邀请 月榜结束执行"); } } try { @@ -83,9 +101,12 @@ public class RankJob { } try { + log.info("刷新用户年龄 开始执行"); userService.refreshByAge(); }catch (Exception e){ log.error("刷新用户年龄失败!",e); + } finally { + log.info("刷新用户年龄 结束执行"); } try { long anchorNum = anchorService.count(Wrappers.emptyWrapper()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java b/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java index 10c80dfd..b9d833e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/op/BusOp.java @@ -73,7 +73,7 @@ public class BusOp { public void refreshUserVipStatus(){ int current = 0; - Page page = new Page<>(0, 10); + Page page = new Page<>(0, 100); while (true){ current++; page.setCurrent(current); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java index 1afe66e4..113e313d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/IndexController.java @@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Collections; import java.util.List; @@ -103,6 +104,10 @@ public class IndexController { if(query.getType() == null){ query.setType(1); } + if(page.checkPageNum(5)){ + return R.ok(Collections.emptyList()); + } + page.resetPageSize(); Page res = userService.pageApp(page,query); return R.ok(res.getRecords()); } @@ -111,6 +116,10 @@ public class IndexController { @Operation(summary = "群打招呼界面-用户搜索接口") @Log(title = "群打招呼界面-用户搜索接口", businessType = BusinessType.OTHER, isPrintResponseData = false, isSaveDb = false) public R> greetQuery(PageQuery page, GreetQuery query){ + if(page.checkPageNum(5)){ + return R.ok(Collections.emptyList()); + } + page.resetPageSize(); Page res = userService.greetPageApp(page,query); return R.ok(res.getRecords()); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java index 34364bfc..2e64f8bc 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/HomeManager.java @@ -13,6 +13,7 @@ import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.AnchorTopService; import com.ruoyi.cai.service.UserService; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.ServletUtils; import org.apache.commons.collections4.CollectionUtils; @@ -106,13 +107,19 @@ public class HomeManager { }else if(anchorListQueryTypeEnum == AnchorListQueryTypeEnum.NEW){ RBucket> bucket = redissonClient.getBucket(RedisHttpConstant.HOME_NEW_REDIS); vos = bucket.get(); - } else { // 同城查询 + } else if(anchorListQueryTypeEnum == AnchorListQueryTypeEnum.CITY){ // 同城查询 if(query.getCityId() == null){ return Collections.emptyList(); } query.setOnlineStatus(1); query.setOpenVideoStatus(1); + if(pageQuery.checkPageNum(20)){ + return Collections.emptyList(); + } + pageQuery.resetPageSize(); return anchorService.pageApp(pageQuery, query).getRecords(); + }else{ + return Collections.emptyList(); } Collections.shuffle(vos); Integer pageNum = pageQuery.getPageNum(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java index c37de184..95b2039b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/DynamicService.java @@ -36,7 +36,6 @@ public interface DynamicService extends IService { void clearDynamic(Integer hours); - @Transactional(rollbackFor = Exception.class) void deleteDynamicAdmin(Long id); boolean auditSuccess(List ids); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java index 7d9f9d40..c4b0b412 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/DynamicServiceImpl.java @@ -218,7 +218,6 @@ public class DynamicServiceImpl extends ServiceImpl impl } } - @Transactional(rollbackFor = Exception.class) @Override public void deleteDynamicAdmin(Long id){ this.removeById(id); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java index f9613dd7..c9286e13 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/SmsVerifyServiceImpl.java @@ -133,7 +133,7 @@ public class SmsVerifyServiceImpl extends ServiceImpl List list = this.list(Wrappers.lambdaUpdate(SmsVerify.class) .lt(SmsVerify::getCreateTime, deleteTimeFlag) .last("limit 100")); - if(index > 500 || CollectionUtils.isEmpty(list)){ + if(index > 5000 || CollectionUtils.isEmpty(list)){ break; } index++; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java index 66a98ae2..b6313587 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java @@ -137,6 +137,8 @@ public class UserServiceImpl extends ServiceImpl implements Us mapperQuery.setNickname(query.getText()); }else if(query.getType() == 3){ mapperQuery.setUsercode(query.getText()); + }else{ + return new Page<>(); } return baseMapper.pageApp(page.build(),mapperQuery); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java index fd3cf187..489d47d7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java @@ -9,6 +9,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sql.SqlUtil; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.web.jsf.FacesContextUtils; import java.io.Serializable; import java.util.ArrayList; @@ -61,6 +62,19 @@ public class PageQuery implements Serializable { // public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; public static final int DEFAULT_PAGE_SIZE = 20; + public boolean checkPageNum(int pageNum){ + if(this.pageNum != null && this.pageNum > pageNum){ + return true; + } + return false; + } + + public void resetPageSize(){ + if(this.pageSize != null && this.pageSize > DEFAULT_PAGE_SIZE){ + this.pageSize = DEFAULT_PAGE_SIZE; + } + } + public Page build() { Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM); Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);