From 616594af9e6773452eacfce235737afe38e184df Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 21 Aug 2024 14:00:35 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/{aspect => conf}/LimitRequest.java | 2 +- .../xboe/school/{aspect => conf}/LimitRequestAspect.java | 2 +- .../java/com/xboe/school/study/api/StudyCourseApi.java | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequest.java (87%) rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequestAspect.java (98%) 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/conf/LimitRequest.java similarity index 87% rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java index 6ff03484..c943011c 100644 --- 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/conf/LimitRequest.java @@ -1,4 +1,4 @@ -package com.xboe.school.aspect; +package com.xboe.school.conf; import java.lang.annotation.*; 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/conf/LimitRequestAspect.java similarity index 98% rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java index 8e2368fa..d8efa0bf 100644 --- 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/conf/LimitRequestAspect.java @@ -1,4 +1,4 @@ -package com.xboe.school.aspect; +package com.xboe.school.conf; import com.xboe.api.vo.Result; 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 7991bd0c..32ef6de6 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.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 com.xboe.school.conf.LimitRequest; 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; From 0fcd4568ecedc30a2018f2a013df208a766dd342 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 4 Sep 2024 16:35:33 +0800 Subject: [PATCH 02/15] =?UTF-8?q?802bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/constants/CacheName.java | 2 + .../com/xboe/school/conf/LimitRequest.java | 12 ---- .../xboe/school/conf/LimitRequestAspect.java | 59 ------------------- .../xboe/school/study/api/StudyCourseApi.java | 26 ++++++-- 4 files changed, 23 insertions(+), 76 deletions(-) delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java 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 b92aff08..3d765d51 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 @@ -133,4 +133,6 @@ public interface CacheName { * 字典缓存key * */ String KEY_DICT="dict"; + + String STUDY_KEY = "StudyKey:"; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java deleted file mode 100644 index c943011c..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java +++ /dev/null @@ -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; -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java deleted file mode 100644 index d8efa0bf..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java +++ /dev/null @@ -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> 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 32ef6de6..32427fc0 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 @@ -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 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 allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(item.getId()); + //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 } if(StringUtils.isBlank(sci.getCourseId())){ From 903a1369f58c28bb21ddc701bcf80c5d693db5d4 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 4 Sep 2024 16:48:12 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 5 ----- .../src/main/java/com/xboe/api/vo/Result.java | 3 --- .../main/java/com/xboe/school/study/api/StudyCourseApi.java | 6 ------ 3 files changed, 14 deletions(-) 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/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 32427fc0..7d5598a6 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 @@ -324,12 +324,6 @@ 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) { String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId(); From b5b17f9b86c2421145e2d8b3728cf75b04ca3264 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 17:55:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) 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..0e7c520f 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 @@ -12,7 +12,7 @@ import com.xboe.api.vo.*; 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 com.xboe.school.study.dao.StudyCourseDao; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.annotation.Aspect; @@ -68,7 +68,10 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - + + @Autowired + StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -98,12 +101,7 @@ 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 @@ -300,7 +298,6 @@ public class StudyCourseApi extends ApiBaseController{ * @param * @return 返回学习条目的id */ - @LimitRequest(count=5) @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ @@ -330,11 +327,7 @@ 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无成情况，就更新进度，一期不会有这种情况 @@ -347,7 +340,7 @@ public class StudyCourseApi extends ApiBaseController{ log.info("在线课学习记录"+allUserList); return success(item.getId()); } - + if(StringUtils.isBlank(sci.getCourseId())){ return error("无课程信息"); } @@ -553,7 +546,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); @@ -708,18 +701,23 @@ public class StudyCourseApi extends ApiBaseController{ } @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) - public JsonResponse findStudyCourseItem(String studyId,String contentId){ + public JsonResponse findStudyCourseItem(String studyId,String contentId,Integer contentTotal, HttpServletRequest request){ if(StringUtils.isBlank(studyId)){ return error("无学习信息"); } if(StringUtils.isBlank(contentId)){ return error("无课程内容信息"); } + String token = request.getHeader("Xboe-Access-Token"); + if (StringUtils.isEmpty(token)) { + token = request.getHeader("token"); + } try { StudyCourseItem rs=studyService.checkHas(studyId, contentId); if(rs==null) { return notfound(); } + scDao.finishCheck(studyId,contentId,contentTotal,token); return success(rs); }catch(Exception e) { log.error("查询课程学习记录错误",e.getMessage()); From 323aca88dac41a6d82fa70ce4eab8fe136ae85d3 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:00:26 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/study/api/StudyCourseApi.java | 1 + 1 file changed, 1 insertion(+) 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 0e7c520f..eba9be34 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 @@ -699,6 +699,7 @@ public class StudyCourseApi extends ApiBaseController{ return error("查询失败",e.getMessage()); } } + @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) public JsonResponse findStudyCourseItem(String studyId,String contentId,Integer contentTotal, HttpServletRequest request){ From a6336b2bf2bc9a3f64a43901dcab798ab648bb72 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:30:05 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/api/StudyCourseApi.java | 10 ++-------- .../java/com/xboe/school/study/api/StudyExamApi.java | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) 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 eba9be34..29c2ec3e 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 @@ -69,8 +69,7 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - @Autowired - StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -702,23 +701,18 @@ public class StudyCourseApi extends ApiBaseController{ @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) - public JsonResponse findStudyCourseItem(String studyId,String contentId,Integer contentTotal, HttpServletRequest request){ + public JsonResponse findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){ if(StringUtils.isBlank(studyId)){ return error("无学习信息"); } if(StringUtils.isBlank(contentId)){ return error("无课程内容信息"); } - String token = request.getHeader("Xboe-Access-Token"); - if (StringUtils.isEmpty(token)) { - token = request.getHeader("token"); - } try { StudyCourseItem rs=studyService.checkHas(studyId, contentId); if(rs==null) { return notfound(); } - scDao.finishCheck(studyId,contentId,contentTotal,token); return success(rs); }catch(Exception e) { log.error("查询课程学习记录错误",e.getMessage()); 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..e1bd090d 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; @@ -54,7 +57,7 @@ public class StudyExamApi extends ApiBaseController{ } @PostMapping("/save") - public JsonResponse save(@RequestBody StudyExam exam, HttpServletRequest request){ + public JsonResponse save(@RequestBody StudyExam exam,Integer contentTotal, HttpServletRequest request){ if(StringUtils.isBlank(exam.getCourseId())) { return badRequest("无课程信息"); } @@ -97,6 +100,7 @@ public class StudyExamApi extends ApiBaseController{ //执行完毕 清除redis记录 redisTemplate.delete(key); + scDao.finishCheck(exam.getStudyId(),exam.getContentId(),contentTotal,token); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam); From 0e8f8b1cb7dbe3be550e3920b624f127fbb59740 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:45:10 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/study/api/StudyExamApi.java | 4 ++-- .../src/main/java/com/xboe/school/study/entity/StudyExam.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) 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 e1bd090d..6091d49a 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 @@ -57,7 +57,7 @@ public class StudyExamApi extends ApiBaseController{ } @PostMapping("/save") - public JsonResponse save(@RequestBody StudyExam exam,Integer contentTotal, HttpServletRequest request){ + public JsonResponse save(@RequestBody StudyExam exam, HttpServletRequest request){ if(StringUtils.isBlank(exam.getCourseId())) { return badRequest("无课程信息"); } @@ -100,7 +100,7 @@ public class StudyExamApi extends ApiBaseController{ //执行完毕 清除redis记录 redisTemplate.delete(key); - scDao.finishCheck(exam.getStudyId(),exam.getContentId(),contentTotal,token); + scDao.finishCheck(exam.getStudyId(),exam.getContentId(),exam.getContentTotal(),token); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java index 5e55a9bc..8ae74712 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java @@ -133,4 +133,7 @@ public class StudyExam extends IdEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "last_time") private LocalDateTime lastTime; + + /**内容的总数量*/ + private Integer contentTotal; } From 48ac060ab24ed132906a243ffe731469c420cd48 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:54:38 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= =?UTF-8?q?,=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/school/study/api/StudyExamApi.java | 1 - .../src/main/java/com/xboe/school/study/entity/StudyExam.java | 3 --- 2 files changed, 4 deletions(-) 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 6091d49a..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 @@ -100,7 +100,6 @@ public class StudyExamApi extends ApiBaseController{ //执行完毕 清除redis记录 redisTemplate.delete(key); - scDao.finishCheck(exam.getStudyId(),exam.getContentId(),exam.getContentTotal(),token); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java index 8ae74712..5e55a9bc 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyExam.java @@ -133,7 +133,4 @@ public class StudyExam extends IdEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Column(name = "last_time") private LocalDateTime lastTime; - - /**内容的总数量*/ - private Integer contentTotal; } From 24894444f6a2a3b33d21fe9239014c4fb3a826ba Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 19:27:31 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= =?UTF-8?q?,=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8Aredis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyExamApi.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 15116159..919d8148 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 @@ -72,17 +72,17 @@ public class StudyExamApi extends ApiBaseController{ token = request.getHeader("token"); } try { - String key = exam.getStudyId() + "_" + exam.getContentId(); +// String key = exam.getStudyId() + "_" + exam.getContentId(); //判断是否存在redis - if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){ - log.info("------------试卷提交验证中，请等待！ "); - return error("","试卷提交验证中，请等待"); - } - //加入redis 2分钟过期 - redisTemplate.opsForValue().set(key,key); - //设置过期时间为1天 - redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS); - log.info("------------设置redis-key ，请等待！ " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key)); +// if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){ +// log.info("------------试卷提交验证中，请等待！ "); +// return error("","试卷提交验证中，请等待"); +// } +// //加入redis 2分钟过期 +// redisTemplate.opsForValue().set(key,key); +// //设置过期时间为1天 +// redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS); +// log.info("------------设置redis-key ，请等待！ " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key)); CurrentUser cu=getCurrent(); @@ -99,7 +99,7 @@ public class StudyExamApi extends ApiBaseController{ exam.setPaperJson(""); //执行完毕 清除redis记录 - redisTemplate.delete(key); +// redisTemplate.delete(key); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam); From d1e9b53625a59ef49f358550e24a72f9d785ddfd Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 19:43:18 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=AE=A1=E7=AE=97?= =?UTF-8?q?,redis=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyExamApi.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 919d8148..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 @@ -72,17 +72,17 @@ public class StudyExamApi extends ApiBaseController{ token = request.getHeader("token"); } try { -// String key = exam.getStudyId() + "_" + exam.getContentId(); + String key = exam.getStudyId() + "_" + exam.getContentId(); //判断是否存在redis -// if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){ -// log.info("------------试卷提交验证中，请等待！ "); -// return error("","试卷提交验证中，请等待"); -// } -// //加入redis 2分钟过期 -// redisTemplate.opsForValue().set(key,key); -// //设置过期时间为1天 -// redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS); -// log.info("------------设置redis-key ，请等待！ " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key)); + if(StringUtils.isNotEmpty(redisTemplate.opsForValue().get(key))){ + log.info("------------试卷提交验证中，请等待！ "); + return error("","试卷提交验证中，请等待"); + } + //加入redis 2分钟过期 + redisTemplate.opsForValue().set(key,key); + //设置过期时间为1天 + redisTemplate.expire(key, 5 * 60, TimeUnit.SECONDS); + log.info("------------设置redis-key ，请等待！ " + LocalDateTime.now() + ", key = " + redisTemplate.opsForValue().get(key)); CurrentUser cu=getCurrent(); @@ -99,7 +99,7 @@ public class StudyExamApi extends ApiBaseController{ exam.setPaperJson(""); //执行完毕 清除redis记录 -// redisTemplate.delete(key); + redisTemplate.delete(key); List allUserList = thirdApi.getStudyCourseList(exam.getStudyId() ,exam.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(exam); From b40391ba6a8ac8b1bc81299c78775644e36a3978 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 27 Aug 2024 16:59:40 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=90=8D=E7=A7=B0=E6=9D=A1=E4=BB=B6=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/exam/service/impl/AloneExamServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) 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())); } From 29a17efd44b2b846452f3a45e4173796d1c546e1 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Tue, 10 Sep 2024 15:32:54 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/api/StudyCourseApi.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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 7d5598a6..73b49625 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 @@ -92,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 @@ -289,12 +283,7 @@ public class StudyCourseApi extends ApiBaseController{ } - /** - * 记录学习信息，在学习每个资源时都要记录.前端用户打开课程资源按规则调用带着课程及学习信息调用此接口。 - * @param - * @return 返回学习条目的id - */ - //@LimitRequest(count=5) + @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ From e4adadcdbf5d1d6c8822f8a188786d2d09a1a19c Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 21 Aug 2024 14:00:35 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=A4=84=E7=90=86study=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../school/{aspect => conf}/LimitRequest.java | 2 +- .../{aspect => conf}/LimitRequestAspect.java | 2 +- .../xboe/school/study/api/StudyCourseApi.java | 28 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequest.java (87%) rename servers/boe-server-all/src/main/java/com/xboe/school/{aspect => conf}/LimitRequestAspect.java (98%) 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/conf/LimitRequest.java similarity index 87% rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequest.java rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java index 6ff03484..c943011c 100644 --- 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/conf/LimitRequest.java @@ -1,4 +1,4 @@ -package com.xboe.school.aspect; +package com.xboe.school.conf; import java.lang.annotation.*; 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/conf/LimitRequestAspect.java similarity index 98% rename from servers/boe-server-all/src/main/java/com/xboe/school/aspect/LimitRequestAspect.java rename to servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java index 8e2368fa..d8efa0bf 100644 --- 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/conf/LimitRequestAspect.java @@ -1,4 +1,4 @@ -package com.xboe.school.aspect; +package com.xboe.school.conf; import com.xboe.api.vo.Result; 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 29c2ec3e..f8d8f0d4 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,14 @@ 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.module.course.vo.TeacherVo; -import com.xboe.module.usergroup.entity.UserGroupItem; import com.xboe.module.usergroup.service.IUserGroupService; -import com.xboe.school.study.dao.StudyCourseDao; +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; @@ -68,9 +63,7 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - - - + @Autowired IStudyCourseService service; @@ -100,7 +93,12 @@ 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 @@ -297,6 +295,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param * @return 返回学习条目的id */ + @LimitRequest(count=5) @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ @@ -326,7 +325,11 @@ 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无成情况，就更新进度，一期不会有这种情况 @@ -339,7 +342,7 @@ public class StudyCourseApi extends ApiBaseController{ log.info("在线课学习记录"+allUserList); return success(item.getId()); } - + if(StringUtils.isBlank(sci.getCourseId())){ return error("无课程信息"); } @@ -698,7 +701,6 @@ public class StudyCourseApi extends ApiBaseController{ return error("查询失败",e.getMessage()); } } - @RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST}) public JsonResponse findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){ From 3a5b13dfe8c74a922ffddf463bb6f0d70e8b0e4b Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 4 Sep 2024 16:35:33 +0800 Subject: [PATCH 14/15] =?UTF-8?q?802bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/constants/CacheName.java | 2 + .../com/xboe/school/conf/LimitRequest.java | 12 ---- .../xboe/school/conf/LimitRequestAspect.java | 59 ------------------- .../xboe/school/study/api/StudyCourseApi.java | 25 ++++++-- 4 files changed, 23 insertions(+), 75 deletions(-) delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java delete mode 100644 servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java 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/school/conf/LimitRequest.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java deleted file mode 100644 index c943011c..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequest.java +++ /dev/null @@ -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; -} diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java b/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java deleted file mode 100644 index d8efa0bf..00000000 --- a/servers/boe-server-all/src/main/java/com/xboe/school/conf/LimitRequestAspect.java +++ /dev/null @@ -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> 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 f8d8f0d4..91f1b5c2 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 @@ -6,6 +6,7 @@ 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.aspect.LimitRequest; @@ -295,7 +296,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param * @return 返回学习条目的id */ - @LimitRequest(count=5) + //@LimitRequest(count=5) @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ @@ -330,17 +331,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 allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token); log.info("在线课学习记录"+allUserList); return success(item.getId()); + //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 } if(StringUtils.isBlank(sci.getCourseId())){ From f852674994327aa0cee41940fc765ce592fd88c1 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Wed, 4 Sep 2024 16:48:12 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 5 ----- .../src/main/java/com/xboe/api/vo/Result.java | 3 --- .../main/java/com/xboe/school/study/api/StudyCourseApi.java | 6 ------ 3 files changed, 14 deletions(-) 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/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index 91f1b5c2..56dc5b59 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 @@ -326,12 +326,6 @@ 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) { String studyKey = CacheName.NAME_AUTH + ":" + CacheName.STUDY_KEY + item.getCourseId()+":"+cuser.getAccountId()+":"+item.getContentId();