diff --git a/src/main/java/com/sqx/common/aspect/DebounceAspect.java b/src/main/java/com/sqx/common/aspect/DebounceAspect.java index 0b3bb99b..289e1c69 100644 --- a/src/main/java/com/sqx/common/aspect/DebounceAspect.java +++ b/src/main/java/com/sqx/common/aspect/DebounceAspect.java @@ -1,6 +1,7 @@ package com.sqx.common.aspect; import com.sqx.common.annotation.Debounce; +import com.sqx.common.utils.Result; import com.sqx.common.utils.SpelUtil; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -76,7 +77,7 @@ public class DebounceAspect { return joinPoint.proceed(); } // 在防抖间隔内，不执行目标方法，直接返回 - return null; + return Result.error("请求频繁，请重试"); } private Object debounceForSpecificValue(ProceedingJoinPoint joinPoint, String methodSignature, long interval, TimeUnit timeUnit, Object targetValue) throws Throwable { @@ -89,7 +90,7 @@ public class DebounceAspect { return joinPoint.proceed(); } // 在防抖间隔内，不执行目标方法，直接返回 - return null; + return Result.error("请求频繁，请重试"); } public void cleanExpiredRecords() { diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java index daf6e39f..08b6ba8c 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java +++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java @@ -208,8 +208,5 @@ public class UserEntity implements Serializable { private Integer vipType; - public UserEntity getDesensitizationInfo() { - this.setPassword(null); - return this; - } + } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index a2382026..1e55a3a1 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -915,7 +915,7 @@ public class UserServiceImpl extends ServiceImpl implements } userInfo.setUpdateTime(DateUtil.date().toString()); baseMapper.updateById(userInfo); - return getResult(userInfo.getDesensitizationInfo()); + return getResult(userInfo); } @Override @@ -972,7 +972,7 @@ public class UserServiceImpl extends ServiceImpl implements if (userEntity != null) { inviteService.saveBody(userInfo.getUserId(), userEntity); } - return getResult(userInfo.getDesensitizationInfo()); + return getResult(userInfo); } @Override diff --git a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java index 208a1769..2fd9fac3 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseCollectDao.java @@ -20,6 +20,6 @@ public interface CourseCollectDao extends BaseMapper { List selectClassify1In3(@Param("userId") Long userId); - List selectClassify1In2(@Param("userId") Long userId); - List selectClassify1ByUserId(@Param("userId") Long userId); + List selectClassify2(@Param("userId") Long userId); + List selectClassify3ByUserId(@Param("userId") Long userId); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 0bb9fa58..1f09cfae 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -140,28 +140,30 @@ public class CourseCollectServiceImpl extends ServiceImpl courses = new ArrayList<>(); - //收藏 if (classify.equals(1)) { - //查 收藏记录 + //收藏记录 courses = baseMapper.selectClassify1In3(userId); }else if (classify.equals(2)){ - courses = baseMapper.selectClassify1In2(userId); + //点赞 + courses = baseMapper.selectClassify2(userId); } else { - courses = baseMapper.selectClassify1ByUserId(userId); - } - if (CollectionUtil.isEmpty(courses)) { - return Result.success().put("data", PageUtils.page(new PageInfo<>(courses), true)); + //观看历史 + courses = baseMapper.selectClassify3ByUserId(userId); } + //剧id Set courseIdList = new HashSet<>(); //详情id Set courseDetailIds = new HashSet<>(); + //剧集-观看记录时间 + Map upTime = new HashMap<>(); courses.forEach(s -> { if (s == null) { return; } courseIdList.add(s.getCourseId()); courseDetailIds.add(s.getCourseDetailsId()); + upTime.put(s.getCourseId(),s.getUpdateTime()); }); List courseList = courseIdList.isEmpty() ? new ArrayList<>() : courseDao.selectList(new LambdaQueryWrapper().in(Course::getCourseId, courseIdList)); @@ -170,20 +172,20 @@ public class CourseCollectServiceImpl extends ServiceImpl().in(CourseDetails::getCourseDetailsId, courseDetailIds)); Map courseDetailsMap = courseDetails1.stream() .collect(Collectors.toMap(CourseDetails::getCourseId, item -> item, (key1, key2) -> key1)); -// List courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList); -// Map countMap = courseDetails2.stream() -// .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount)); if (CollectionUtil.isNotEmpty(courseList)) { for (Course course : courseList) { -// course.setCourseClassification(courseClassificationDao.selectById(course.getClassifyId())); CourseDetails courseDetails = courseDetailsMap.getOrDefault(course.getCourseId(), null); course.setCourseDetailsCount(courseDetailsDao.countCourseByCourseId(course.getCourseId())); if (courseDetails != null) { course.setCourseDetailsName(courseDetails.getCourseDetailsName()); course.setCourseDetailsId(courseDetails.getCourseDetailsId()); } + if (upTime.containsKey(course.getCourseId())) { + course.setUpdateTime(upTime.get(course.getCourseId())); + } } + courseList.sort(Comparator.comparing(Course::getUpdateTime).reversed()); } PageInfo pageInfo = new PageInfo<>(courseList); return Result.success().put("data", PageUtils.page(pageInfo, true)); diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 0550e5d4..3b498f6f 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -88,7 +88,7 @@ public class WuyouController { return Result.error("订单已支付"); } if (redisService.setCreateOrderFlagAndCheckLimit(order.getUserId(), orderId)) { - userService.addBlackUser(order.getUserId(), "一分钟频繁下单超12次"); + userService.addBlackUser(order.getUserId(), "一分钟频繁下单超22次"); } PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); diff --git a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java index 2c37347b..88614d05 100644 --- a/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java +++ b/src/main/java/com/sqx/modules/redisService/impl/RedisServiceImpl.java @@ -354,6 +354,6 @@ public class RedisServiceImpl implements RedisService { redisTemplate.opsForSet().add(key, orderId.toString()); redisUtils.expire(key, 60); Set members = redisTemplate.opsForSet().members(key); - return members != null && members.size() > 12; + return members != null && members.size() > 22; } } diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml index 40cad417..202f95c0 100644 --- a/src/main/resources/mapper/course/CourseCollectDao.xml +++ b/src/main/resources/mapper/course/CourseCollectDao.xml @@ -33,34 +33,34 @@ - SELECT c1.course_id as courseId, - c1.course_details_id as courseDetailsId + c1.course_details_id as courseDetailsId, + c1.update_time as updateTime FROM `course_collect` c1 WHERE c1.classify = 2 AND c1.user_id = #{userId} - order by c1.update_time desc - SELECT c1.course_id as courseId, - c1.course_details_id as courseDetailsId + c1.course_details_id as courseDetailsId, + c1.update_time as updateTime FROM `course_collect` c1 WHERE c1.classify = 3 AND c1.user_id = #{userId} - order by c1.update_time desc