From bddb11caf8c18acf9c6dacf2172964b94da8b031 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 10:53:26 +0800 Subject: [PATCH 01/17] =?UTF-8?q?study=E6=8E=A5=E5=8F=A3=E5=8A=A0redis?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/school/study/api/StudyCourseApi.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 9e875451..9df9b46e 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 @@ -321,8 +321,19 @@ public class StudyCourseApi extends ApiBaseController{ if (StringUtils.isEmpty(token)) { token = request.getHeader("token"); } + + // 20240815 特训营结营考试 临时代码 + if(redisTemplate.opsForValue().get(sci.getStudyId()+sci.getContentId())==null){ + redisTemplate.opsForValue().set(sci.getStudyId()+sci.getContentId(),sci.getStudyId()); + //设置过期时间为1天 + redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 60, TimeUnit.SECONDS); + }else{ + return success(""); + } + //检查是否已存在 StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); + if(item!=null) { //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) { From 8e1b7519efa737d93fbd0442bf1e2d516372de0b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 11:31:17 +0800 Subject: [PATCH 02/17] =?UTF-8?q?study=E6=8E=A5=E5=8F=A3=E5=8A=A0redis?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9df9b46e..d17f9641 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,7 +326,7 @@ public class StudyCourseApi extends ApiBaseController{ if(redisTemplate.opsForValue().get(sci.getStudyId()+sci.getContentId())==null){ redisTemplate.opsForValue().set(sci.getStudyId()+sci.getContentId(),sci.getStudyId()); //设置过期时间为1天 - redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 60, TimeUnit.SECONDS); + redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 5*60, TimeUnit.SECONDS); }else{ return success(""); } From be3bae969ca35ec749291dce6f34c2b9ed251c09 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 11:35:02 +0800 Subject: [PATCH 03/17] =?UTF-8?q?study=E6=8E=A5=E5=8F=A3=E5=8A=A0redis?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/school/study/api/StudyCourseApi.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 d17f9641..4da7869f 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 @@ -418,6 +418,14 @@ public class StudyCourseApi extends ApiBaseController{ StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); if(item!=null) { //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 + // 20240815 特训营结营考试 临时代码 + if(redisTemplate.opsForValue().get(sci.getStudyId()+sci.getContentId())==null){ + redisTemplate.opsForValue().set(sci.getStudyId()+sci.getContentId(),sci.getStudyId()); + //设置过期时间为1天 + redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 5*60, TimeUnit.SECONDS); + }else{ + return success(""); + } if(item.getProgress()<100) { studyService.updateProcess(item.getId(),sci.getStudyId(),sci.getCourseId(), sci.getContentTotal(),100,token); } From d2d7fab96c4b1c26007c25bdcc5405e29803eee9 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 12:03:05 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/school/study/api/StudyCourseApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4da7869f..9b5f262c 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 @@ -292,7 +292,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param * @return 返回学习条目的id */ - @PostMapping("/study") +// @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ if(StringUtils.isBlank(sci.getStudyId())){ @@ -399,7 +399,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param sci * @return */ - @PostMapping("/study-content-finish") +// @PostMapping("/study-content-finish") public JsonResponse studyContentFinish(@RequestBody StudyContentDto sci, HttpServletRequest request){ if(StringUtils.isBlank(sci.getStudyId())){ From 2b07029aca92dc4f15f6a0e52a606a2ae4433d75 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 12:09:40 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/dao/StudyCourseDao.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java index d0985202..c8e3ae12 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java @@ -53,16 +53,16 @@ public class StudyCourseDao extends BaseDao { float percent=n*100/total; if(n>=total) { //自主报名的课程,代表学习完成 - super.updateMultiFieldById(studyId, - UpdateBuilder.create("progress",100f), - UpdateBuilder.create("lastTime",now), - UpdateBuilder.create("finishTime",now), - UpdateBuilder.create("status",StudyCourse.STATUS_FINISH)); +// super.updateMultiFieldById(studyId, +// UpdateBuilder.create("progress",100f), +// UpdateBuilder.create("lastTime",now), +// UpdateBuilder.create("finishTime",now), +// UpdateBuilder.create("status",StudyCourse.STATUS_FINISH)); }else { - super.updateMultiFieldById(studyId, - UpdateBuilder.create("progress",percent), - UpdateBuilder.create("lastTime",LocalDateTime.now()), - UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); +// super.updateMultiFieldById(studyId, +// UpdateBuilder.create("progress",percent), +// UpdateBuilder.create("lastTime",LocalDateTime.now()), +// UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); } List allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token); From 6b0050286cddc585a3f24d5eed1ba6f85eac760e Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 15:19:59 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 4 ++-- .../xboe/school/study/dao/StudyCourseDao.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 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 9b5f262c..4da7869f 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 @@ -292,7 +292,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param * @return 返回学习条目的id */ -// @PostMapping("/study") + @PostMapping("/study") public JsonResponse study(@RequestBody StudyContentDto sci, HttpServletRequest request){ if(StringUtils.isBlank(sci.getStudyId())){ @@ -399,7 +399,7 @@ public class StudyCourseApi extends ApiBaseController{ * @param sci * @return */ -// @PostMapping("/study-content-finish") + @PostMapping("/study-content-finish") public JsonResponse studyContentFinish(@RequestBody StudyContentDto sci, HttpServletRequest request){ if(StringUtils.isBlank(sci.getStudyId())){ diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java index c8e3ae12..d0985202 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java @@ -53,16 +53,16 @@ public class StudyCourseDao extends BaseDao { float percent=n*100/total; if(n>=total) { //自主报名的课程,代表学习完成 -// super.updateMultiFieldById(studyId, -// UpdateBuilder.create("progress",100f), -// UpdateBuilder.create("lastTime",now), -// UpdateBuilder.create("finishTime",now), -// UpdateBuilder.create("status",StudyCourse.STATUS_FINISH)); + super.updateMultiFieldById(studyId, + UpdateBuilder.create("progress",100f), + UpdateBuilder.create("lastTime",now), + UpdateBuilder.create("finishTime",now), + UpdateBuilder.create("status",StudyCourse.STATUS_FINISH)); }else { -// super.updateMultiFieldById(studyId, -// UpdateBuilder.create("progress",percent), -// UpdateBuilder.create("lastTime",LocalDateTime.now()), -// UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); + super.updateMultiFieldById(studyId, + UpdateBuilder.create("progress",percent), + UpdateBuilder.create("lastTime",LocalDateTime.now()), + UpdateBuilder.create("status",StudyCourse.STATUS_STUDYING)); } List allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token); From 1f0060c4dc9577168262c08dcd6fe6c81c9e1024 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 15:27:41 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 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 4da7869f..e9961391 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 @@ -322,18 +322,18 @@ public class StudyCourseApi extends ApiBaseController{ token = request.getHeader("token"); } - // 20240815 特训营结营考试 临时代码 - if(redisTemplate.opsForValue().get(sci.getStudyId()+sci.getContentId())==null){ - redisTemplate.opsForValue().set(sci.getStudyId()+sci.getContentId(),sci.getStudyId()); - //设置过期时间为1天 - redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 5*60, TimeUnit.SECONDS); - }else{ - return success(""); - } //检查是否已存在 StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); + // 20240815 特训营结营考试 临时代码 + if(redisTemplate.opsForValue().get(item.getId())==null){ + redisTemplate.opsForValue().set(item.getId(),item.getId()); + //设置过期时间为1天 + redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); + }else{ + return success(""); + } if(item!=null) { //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) { @@ -419,10 +419,10 @@ public class StudyCourseApi extends ApiBaseController{ if(item!=null) { //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 // 20240815 特训营结营考试 临时代码 - if(redisTemplate.opsForValue().get(sci.getStudyId()+sci.getContentId())==null){ - redisTemplate.opsForValue().set(sci.getStudyId()+sci.getContentId(),sci.getStudyId()); + if(redisTemplate.opsForValue().get(item.getId())==null){ + redisTemplate.opsForValue().set(item.getId(),item.getId()); //设置过期时间为1天 - redisTemplate.expire(sci.getStudyId()+sci.getContentId(), 5*60, TimeUnit.SECONDS); + redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); }else{ return success(""); } @@ -531,6 +531,14 @@ public class StudyCourseApi extends ApiBaseController{ token = request.getHeader("token"); } try { + // 20240815 特训营结营考试 临时代码 + if(redisTemplate.opsForValue().get(itemId)==null){ + redisTemplate.opsForValue().set(itemId,itemId); + //设置过期时间为1天 + redisTemplate.expire(itemId, 60, TimeUnit.SECONDS); + }else{ + return success(true); + } studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token); List allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token); log.info("在线课学习记录"+allUserList); From a26ee1c707951a2626c1402373ad503548c7227b Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 15:42:45 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/school/study/api/StudyCourseApi.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e9961391..122a97b3 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 @@ -327,7 +327,7 @@ public class StudyCourseApi extends ApiBaseController{ StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); // 20240815 特训营结营考试 临时代码 - if(redisTemplate.opsForValue().get(item.getId())==null){ + if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ redisTemplate.opsForValue().set(item.getId(),item.getId()); //设置过期时间为1天 redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); @@ -419,7 +419,7 @@ public class StudyCourseApi extends ApiBaseController{ if(item!=null) { //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 // 20240815 特训营结营考试 临时代码 - if(redisTemplate.opsForValue().get(item.getId())==null){ + if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ redisTemplate.opsForValue().set(item.getId(),item.getId()); //设置过期时间为1天 redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); @@ -532,7 +532,7 @@ public class StudyCourseApi extends ApiBaseController{ } try { // 20240815 特训营结营考试 临时代码 - if(redisTemplate.opsForValue().get(itemId)==null){ + if(itemId != null && redisTemplate.opsForValue().get(itemId)==null){ redisTemplate.opsForValue().set(itemId,itemId); //设置过期时间为1天 redisTemplate.expire(itemId, 60, TimeUnit.SECONDS); From 61754d3852581eedde0589b3e8ede70d96ca81ca Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Thu, 15 Aug 2024 16:26:47 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=94=BE=E5=BC=80redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 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 122a97b3..97d9b7f4 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 @@ -327,13 +327,13 @@ public class StudyCourseApi extends ApiBaseController{ StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId()); // 20240815 特训营结营考试 临时代码 - if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ - redisTemplate.opsForValue().set(item.getId(),item.getId()); - //设置过期时间为1天 - redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); - }else{ - return success(""); - } +// if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ +// redisTemplate.opsForValue().set(item.getId(),item.getId()); +// //设置过期时间为1天 +// redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); +// }else{ +// return success(""); +// } if(item!=null) { //如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况 if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) { @@ -419,13 +419,13 @@ public class StudyCourseApi extends ApiBaseController{ if(item!=null) { //如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况 // 20240815 特训营结营考试 临时代码 - if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ - redisTemplate.opsForValue().set(item.getId(),item.getId()); - //设置过期时间为1天 - redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); - }else{ - return success(""); - } +// if(item != null && redisTemplate.opsForValue().get(item.getId())==null){ +// redisTemplate.opsForValue().set(item.getId(),item.getId()); +// //设置过期时间为1天 +// redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS); +// }else{ +// return success(""); +// } if(item.getProgress()<100) { studyService.updateProcess(item.getId(),sci.getStudyId(),sci.getCourseId(), sci.getContentTotal(),100,token); } @@ -532,13 +532,13 @@ public class StudyCourseApi extends ApiBaseController{ } try { // 20240815 特训营结营考试 临时代码 - if(itemId != null && redisTemplate.opsForValue().get(itemId)==null){ - redisTemplate.opsForValue().set(itemId,itemId); - //设置过期时间为1天 - redisTemplate.expire(itemId, 60, TimeUnit.SECONDS); - }else{ - return success(true); - } +// if(itemId != null && redisTemplate.opsForValue().get(itemId)==null){ +// redisTemplate.opsForValue().set(itemId,itemId); +// //设置过期时间为1天 +// redisTemplate.expire(itemId, 60, TimeUnit.SECONDS); +// }else{ +// return success(true); +// } studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token); List allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token); log.info("在线课学习记录"+allUserList); From d42d1b2e8383281e44482331f16d68c4cc24f13d Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 17:55:53 +0800 Subject: [PATCH 10/17] =?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/study/api/StudyCourseApi.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 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 9e875451..651b05c3 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 @@ -11,6 +11,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.study.dao.StudyCourseDao; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -65,7 +66,10 @@ import javax.servlet.http.HttpServletRequest; @RestController @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - + + @Autowired + StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -695,18 +699,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 bebe36d39ea9dfad3ffdd6931f23956fdf1c1833 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:00:26 +0800 Subject: [PATCH 11/17] =?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 651b05c3..7e92a759 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 @@ -697,6 +697,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 06415d58ac98d5788daaa425a8332f2abc885c44 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:30:05 +0800 Subject: [PATCH 12/17] =?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 7e92a759..6370d965 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 @@ -67,8 +67,7 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping(value="/xboe/school/study/course") public class StudyCourseApi extends ApiBaseController{ - @Autowired - StudyCourseDao scDao; + @Autowired IStudyCourseService service; @@ -700,23 +699,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 fd9fdd66..86f03ca9 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 a4b034752d8d0f45692558533ea48ab12946eefb Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:45:10 +0800 Subject: [PATCH 13/17] =?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 86f03ca9..2790fccc 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 fffa12344a4a8a30c76ced0b166b466c9e010b7e Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 18:54:38 +0800 Subject: [PATCH 14/17] =?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 2790fccc..a5a9b603 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 24ae3c0ec660e0bb5ba6f9ad90190218d22937f7 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 19:27:31 +0800 Subject: [PATCH 15/17] =?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 a5a9b603..9a124e16 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 89573debef689946f49a10374059f0a274ca8690 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Fri, 23 Aug 2024 19:43:18 +0800 Subject: [PATCH 16/17] =?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 9a124e16..a5a9b603 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 120a4f45fcb220bc9157572fa314f1ab5e78d7d7 Mon Sep 17 00:00:00 2001 From: zhaolongfei <2651195677@qq.com> Date: Thu, 12 Sep 2024 14:35:13 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E8=AF=95=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/exam/api/ExamQuestionApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java index be826651..fbc64aff 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java @@ -166,12 +166,12 @@ public class ExamQuestionApi extends ApiBaseController { return badRequest("请上传正确的试题文件"); } //获取表头 - Row row = sheetAt.getRow(1); + Row row = sheetAt.getRow(2); //从第二行开始获取数据 List examQuestions1 = new ArrayList<>(); QuestionDto questionDto = new QuestionDto(); - for (int i=2;i