hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

802bug修复

Browse Source
This commit is contained in:
zhaolongfei
2024-09-04 16:35:33 +08:00
parent 616594af9e
commit 0fcd4568ec
4 changed files with 23 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java
View File

@@ -133,4 +133,6 @@ public interface CacheName {
* 字典缓存key
* */
String KEY_DICT="dict";
String STUDY_KEY = "StudyKey:";
}

12
servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java
View File

@@ -1,12 +0,0 @@
package com.xboe.school.conf;
import java.lang.annotation.*;
@Documented
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface LimitRequest {
long time() default 2000;
int count() default Integer.MAX_VALUE;
}

59
servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java
View File

@@ -1,59 +0,0 @@
package com.xboe.school.conf;
import com.xboe.api.vo.Result;
import net.jodah.expiringmap.ExpirationPolicy;
import net.jodah.expiringmap.ExpiringMap;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
@Aspect
@Component
public class LimitRequestAspect {
private static ConcurrentHashMap<String, ExpiringMap<String, Integer>> book = new ConcurrentHashMap<>();
// 定义切点
// 让所有有@LimitRequest注解的方法都执行切面方法
@Pointcut("@annotation(limitRequest)")
public void excudeService(LimitRequest limitRequest) {
}
@Around("excudeService(limitRequest)")
public Object doAround(ProceedingJoinPoint pjp, LimitRequest limitRequest) throws Throwable {
// 获得request对象
RequestAttributes ra = RequestContextHolder.getRequestAttributes();
ServletRequestAttributes sra = (ServletRequestAttributes) ra;
HttpServletRequest request = sra.getRequest();
// 获取Map对象， 如果没有则返回默认值
// 第一个参数是key， 第二个参数是默认值
ExpiringMap<String, Integer> map = book.getOrDefault(request.getRequestURI(), ExpiringMap.builder().variableExpiration().build());
Integer uCount = map.getOrDefault(request.getRemoteAddr(), 0);
if (uCount >= limitRequest.count()) { // 超过次数，不执行目标方法
//这里的返回对象类型根据controller方法的返回方式一致
return Result.error("请求过于频繁，请稍后再试");
} else if (uCount == 0){ // 第一次请求时，设置开始有效时间
map.put(request.getRemoteAddr(), uCount + 1, ExpirationPolicy.CREATED, limitRequest.time(), TimeUnit.MILLISECONDS);
} else { // 未超过次数， 记录数据加一
map.put(request.getRemoteAddr(), uCount + 1);
}
book.put(request.getRequestURI(), map);
// result的值就是被拦截方法的返回值
Object result = pjp.proceed();
return result;
}
}

26
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -6,9 +6,9 @@ import java.util.concurrent.TimeUnit;
import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
import com.xboe.api.ThirdApi;
import com.xboe.constants.CacheName;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.module.usergroup.service.IUserGroupService;
import com.xboe.school.conf.LimitRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -294,7 +294,7 @@ public class StudyCourseApi extends ApiBaseController{
* @param
* @return 返回学习条目的id
*/
@LimitRequest(count=5)
//@LimitRequest(count=5)
@PostMapping("/study")
public JsonResponse<String> study(@RequestBody StudyContentDto sci, HttpServletRequest request){
@@ -329,17 +329,33 @@ public class StudyCourseApi extends ApiBaseController{
new Thread(() -> example.someApi()).start();
//检查是否已存在
}
StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
if(item!=null) {
//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();
String studyKey2 = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + sci.getCourseId()+":"+cuser.getAccountId()+":"+sci.getContentId();
redisTemplate.opsForValue().set(studyKey,
String.valueOf(item.getProgress()), 2, TimeUnit.HOURS);
String progressStr = redisTemplate.opsForValue().get(studyKey2);
if (progressStr != null && !progressStr.isEmpty()) {
// 尝试将 Redis 中的字符串转换为整数
int redisProgress = Integer.parseInt(progressStr);
// 假设 item.getProgress() 返回的是 int 类型
int sciProgress = sci.getProgress();
if (redisProgress < sciProgress && redisProgress < 100) {
// 执行一些操作
// if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
// }
studyService.updateProcess(item.getId(), sci.getStudyId(), sci.getCourseId(), sci.getContentTotal(), sci.getProgress(),token);
}
}
//追加学习时长
studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
log.info("在线课学习记录"+allUserList);
return success(item.getId());
//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
}
if(StringUtils.isBlank(sci.getCourseId())){