diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 4b5efdba..2c0d034a 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -84,11 +84,6 @@ xboe-module-es 1.0.0 - - net.jodah - expiringmap - 0.5.10 - it.sauronsoftware jave diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java index a2c610f7..8f837786 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/Result.java @@ -24,7 +24,4 @@ public class Result { private int totalPage; private List list; - public static Object error(String s) { - return "500 服务异常"; - } } \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java index 3a1e70de..b375595c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java +++ b/servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java @@ -153,4 +153,6 @@ public interface CacheName { * 总点赞排行key * */ String CASE_RANK_PRAISE_ALL="case:rank:praise:all"; + + String STUDY_KEY = "StudyKey:"; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java index ce7b612f..95f1539e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java @@ -182,9 +182,6 @@ public class AloneExamServiceImpl implements IAloneExamService{ if(StringUtils.isNotBlank(aea.getTestId())) { query.addFilter(FieldFilters.eq("testId",aea.getTestId())); } - if(StringUtils.isNotBlank(aea.getTestName())) { - query.addFilter(FieldFilters.eq("testName",aea.getTestName())); - } if(StringUtils.isNotBlank(aea.getAid())) { query.addFilter(FieldFilters.eq("aid",aea.getAid())); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java b/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java deleted file mode 100644 index 6ff03484..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.xboe.school.aspect; - -import java.lang.annotation.*; - -@Documented -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -public @interface LimitRequest { - - long time() default 2000; - int count() default Integer.MAX_VALUE; -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java b/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java deleted file mode 100644 index 8e2368fa..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.xboe.school.aspect; - - -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> 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 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; - } - -} \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 50d69659..57595a12 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -3,19 +3,13 @@ package com.xboe.school.study.api; import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import cn.hutool.core.util.ArrayUtil; import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter; import com.xboe.api.ThirdApi; -import com.xboe.api.vo.*; +import com.xboe.constants.CacheName; import com.xboe.module.course.vo.TeacherVo; -import com.xboe.module.usergroup.entity.UserGroupItem; import com.xboe.module.usergroup.service.IUserGroupService; -import com.xboe.school.aspect.LimitRequest; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.aspectj.lang.annotation.Aspect; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.GetMapping; @@ -98,12 +92,6 @@ public class StudyCourseApi extends ApiBaseController{ @Autowired StringRedisTemplate redisTemplate; - private static final RateLimiter rateLimiter = RateLimiter.create(1.0); - public void someApi() { - rateLimiter.acquire(); // 请求之前获取许可 - // 你的业务逻辑 - log.info("Request processed at " + System.currentTimeMillis()); - } /** * 用于查询课程的学习记录 * @param pager @@ -330,22 +318,32 @@ public class StudyCourseApi extends ApiBaseController{ if (StringUtils.isEmpty(token)) { token = request.getHeader("token"); } - StudyCourseApi example = new StudyCourseApi(); - for (int i = 0; i < 10; i++) { - 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 allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(item.getId()); + //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 } if(StringUtils.isBlank(sci.getCourseId())){ @@ -553,7 +551,7 @@ public class StudyCourseApi extends ApiBaseController{ //检查是否已存在 try { studyService.updateLastTime(itemId,videoTime, getCurrent().getAccountId()); - if (contentId != null && courseId != null){ + if (contentId != null && courseId != null && progressVideo != null){ contentService.updateProcessVideo(contentId, courseId, progressVideo); } return success(true); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java index add20daf..15116159 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import com.xboe.api.ThirdApi; +import com.xboe.school.study.dao.StudyCourseDao; import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/exam") public class StudyExamApi extends ApiBaseController{ + @Autowired + StudyCourseDao scDao; @Autowired IStudyExamService sexamService;