From c97ae0369607c7091041273012b291d3b6e6bdc1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 25 八月 2025 10:10:01 +0800
Subject: [PATCH] 迭代代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 176 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 99 insertions(+), 77 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index c76eac0..b6cf51a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -198,12 +198,17 @@
List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1)
.eq(TCategory::getType, 2)
.like(TCategory::getName, query.getCategoryName()).list()
- .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ .stream().map(TCategory::getId).collect(Collectors.toList());
collect.addAll(collect2);
- if (collect.isEmpty()) {
- collect.add(-1);
+ if (collect2.isEmpty()) {
+ if (collect.isEmpty()) {
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
+ }else{
+ wrapper.in("secondCategory", collect2);
}
- wrapper.in("firstCategory", collect);
+
}
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
@@ -211,15 +216,15 @@
if (StringUtils.hasLength(query.getType())) {
wrapper.like("type", query.getType());
}
+ List<TCategory> list5 = categoryService.list();
wrapper.eq("state", 1);
+ List<TSubject> list = subjectService.list(wrapper);
+
switch (query.getStudyType()) {
case 1:
- List<TSubject> list = subjectService.list(wrapper);
for (TSubject tSubject : list) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
-
+ TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
+ TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
if (first != null && second != null) {
tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
@@ -233,9 +238,8 @@
List<TSubject> list1 = subjectService.list(wrapper);
List<TSubject> tSubjects = new ArrayList<>();
for (TSubject tSubject : list1) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
+ TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
if (first != null && second != null) {
tSubject.setCategoryName(first.getName() + "-" + second.getName());
@@ -250,8 +254,8 @@
case 3:
List<TSubject> list2 = subjectService.list(wrapper);
for (TSubject tSubject : list2) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
+ TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
if (first != null && second != null) {
tSubject.setCategoryName(first.getName() + "-" + second.getName());
@@ -266,9 +270,8 @@
List<TSubject> list3 = subjectService.list(wrapper);
List<TSubject> tSubjects3 = new ArrayList<>();
for (TSubject tSubject : list3) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
+ TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
if (first != null && second != null) {
tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
@@ -282,9 +285,8 @@
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
for (TSubject tSubject : list4) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
+ TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
if (first != null && second != null) {
tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
@@ -319,6 +321,7 @@
studyService.updateById(one);
GameDTO game = dto.getGame();
StoryListenDTO storyListen = dto.getStoryListen();
+ System.err.println("学习配置"+dto);
if (day == 6) {
// 先判断有没有配置
TGame studyId = gameService.getOne(new QueryWrapper<TGame>()
@@ -419,6 +422,15 @@
storyListenService.save(tStoryListen);
}
} else {
+ List<Integer> ids = studyListenService.lambdaQuery().eq(TStudyListen::getId, one.getId())
+ .eq(TStudyListen::getWeek, week)
+ .eq(TStudyListen::getDay, day).list().stream().map(TStudyListen::getId).collect(Collectors.toList());
+ for (Integer id : ids) {
+ subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
+ .eq(TSubjectRecordDetail::getObjectId, id)
+ .eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getType, 1));
+ }
// 删除原有数据
studyListenService.remove(new QueryWrapper<TStudyListen>()
.eq("studyId", one.getId())
@@ -435,6 +447,15 @@
tStudyListen.setIsVip(studyListenDTO.getIsVip());
tStudyListen.setRate(dto.getListenRate());
studyListenService.save(tStudyListen);
+ }
+ List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
+ .eq(TStudyLook::getWeek, week)
+ .eq(TStudyLook::getDay, day).list().stream().map(TStudyLook::getId).collect(Collectors.toList());
+ for (Integer id : ids1) {
+ subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
+ .eq(TSubjectRecordDetail::getObjectId, id)
+ .eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getType, 2));
}
studyLookService.remove(new QueryWrapper<TStudyLook>()
.eq("studyId", one.getId())
@@ -454,6 +475,15 @@
studyLookService.save(tStudyLook);
}
+ List<Integer> ids2 = studyInductionService.lambdaQuery().eq(TStudyInduction::getId, one.getId())
+ .eq(TStudyInduction::getWeek, week)
+ .eq(TStudyInduction::getDay, day).list().stream().map(TStudyInduction::getId).collect(Collectors.toList());
+ for (Integer id : ids2) {
+ subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
+ .eq(TSubjectRecordDetail::getObjectId, id)
+ .eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getType, 3));
+ }
studyInductionService.remove(new QueryWrapper<TStudyInduction>()
.eq("studyId", one.getId())
.eq("week", week)
@@ -471,6 +501,15 @@
tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
studyInductionService.save(tStudyInduction);
}
+ List<Integer> ids3 = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getId, one.getId())
+ .eq(TStudyAnswer::getWeek, week)
+ .eq(TStudyAnswer::getDay, day).list().stream().map(TStudyAnswer::getId).collect(Collectors.toList());
+ for (Integer id : ids3) {
+ subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
+ .eq(TSubjectRecordDetail::getObjectId, id)
+ .eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getType, 4));
+ }
studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
.eq("studyId", one.getId())
.eq("week", week)
@@ -486,9 +525,17 @@
tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
tStudyAnswer.setWeek(week);
tStudyAnswer.setRate(dto.getAnswerRate());
-
tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
studyAnswerService.save(tStudyAnswer);
+ }
+ List<Integer> ids4 = studyPairService.lambdaQuery().eq(TStudyPair::getId, one.getId())
+ .eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDay, day).list().stream().map(TStudyPair::getId).collect(Collectors.toList());
+ for (Integer id : ids4) {
+ subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
+ .eq(TSubjectRecordDetail::getObjectId, id)
+ .eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getType, 5));
}
studyPairService.remove(new QueryWrapper<TStudyPair>()
.eq("studyId", one.getId())
@@ -1001,6 +1048,24 @@
Integer userid = loginStudy.getUserid();
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, loginStudy.getUserid())
.eq(TUserStudy::getDisabled, 0).one();
+ TStudy study = studyService.lambdaQuery().eq(TStudy::getWeek, week).one();
+ if (study.getQuarter()!=1){
+ // 判断上季度 通关率
+ String quarterRate = study.getQuarterRate();
+ BigDecimal bigDecimal = new BigDecimal(quarterRate);
+ // 查询五个自主学习通关率
+ List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getWeek, week)
+ .eq(TSubjectRecordDetail::getUserId, userid).list();
+ List<TSubjectRecordDetail> pass = list.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());
+ if (list.isEmpty()){
+ return R.fail("上季度未达到通关率"+quarterRate+"%,当前通关率0%");
+ }
+ BigDecimal divide = new BigDecimal(pass.size()).divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP);
+ if (divide.compareTo(bigDecimal)<1){
+ return R.fail("上季度未达到通关率"+quarterRate+"%,当前通关率"+divide.multiply(new BigDecimal(100))+"%");
+ }
+
+ }
if (null != studyRecord) {
// 计算当前周 day 1-5的总进度
int computeSchedule = studyService.computeSchedule(studyRecord, week);
@@ -1040,58 +1105,6 @@
if (listen != 100 && listen != -1) {
studyRecord.setListen(100 - listen);
}
-// // 自主学习答题记录 查询通关率
-// List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
-// .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
-// List<TSubjectRecordDetail> listenList = list.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
-// int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
-// List<TSubjectRecordDetail> lookList = list.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
-// int lookPass = (int) lookList.stream().filter(e -> e.getStatus() == 2).count();
-// List<TSubjectRecordDetail> inductionList = list.stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
-// int inductionPass = (int) inductionList.stream().filter(e -> e.getStatus() == 2).count();
-// List<TSubjectRecordDetail> answerList = list.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
-// int answerPass = (int) answerList.stream().filter(e -> e.getStatus() == 2).count();
-// List<TSubjectRecordDetail> pairList = list.stream().filter(e -> e.getType() == 5).collect(Collectors.toList());
-// int pairPass = (int) pairList.stream().filter(e -> e.getStatus() == 2).count();
-// int listenSize = listenList.size();
-// if (listenSize!=0){
-// double listenRate = (double) listenPass /listenSize;
-// studyRecord.setListen((int)listenRate);
-// }else{
-// studyRecord.setListen(-1);
-// }
-// int lookSize = lookList.size();
-// if (lookSize!=0) {
-// double lookRate = (double) lookPass / lookSize;
-// studyRecord.setLook((int) lookRate);
-// }else{
-// studyRecord.setLook(-1);
-// }
-// int inductionSize = inductionList.size();
-//
-// if (inductionSize!=0) {
-// double inductionRate = (double) inductionPass /inductionSize;
-// studyRecord.setInduction((int)inductionRate);
-// }else{
-// studyRecord.setInduction(-1);
-// }
-//
-// int answerSize = answerList.size();
-// if (answerSize!=0) {
-// double answerRate = (double) answerPass /answerSize;
-// studyRecord.setAnswer((int)answerRate);
-// }else{
-// studyRecord.setAnswer(-1);
-// }
-//
-// int pairSize = pairList.size();
-// if (pairSize!=0) {
-// double pairRate = (double) pairPass /pairSize;
-// studyRecord.setPair((int)pairRate);
-// }else{
-// studyRecord.setPair(-1);
-// }
-
}
return R.ok(studyRecord);
}
@@ -1535,6 +1548,7 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ System.err.println("答题DTO"+answerQuestionDTO);
TSubjectRecordDetail byId = subjectRecordDetailService.getById(answerQuestionDTO.getId());
byId.setUserId(null);
byId.setStatus(answerQuestionDTO.getStatus());
@@ -1669,7 +1683,7 @@
return R.tokenError("登录失效！");
}
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -1681,7 +1695,7 @@
.eq(TStudyPair::getDay, 5).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
@@ -1732,7 +1746,7 @@
return R.tokenError("登录失效！");
}
List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
- .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
+ .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList());
int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
int listenSize = listenList.size();
@@ -1744,7 +1758,7 @@
.eq(TStudyPair::getDay, 5).last("limit 1").one();
if (one!=null){
if (listenRate<(Double.parseDouble(one.getRate())/100)){
- return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide+"%");
+ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
}
}
}
@@ -1762,6 +1776,8 @@
photoList.add(new GameMemoryPhotoVO(tSubject.getId(), tSubject.getImg()));
voiceList.add(new GameMemoryVoiceVO(tSubject.getId(), tSubject.getCorrect()));
}
+ photoList = photoList.stream().distinct().collect(Collectors.toList());
+ voiceList = voiceList.stream().distinct().collect(Collectors.toList());
// 校验超级听力是否通过
// studyService.checkClearance(game,userStudy.getUserid());
// 框架记忆数量翻倍，前端需要根据数量画格子
@@ -1980,6 +1996,9 @@
public R<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer quarter, @RequestParam Integer week) {
// 看图配音信息
TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ if (storyListen==null){
+ return R.fail("当前未配置看图配音信息");
+ }
// 题组信息
StudyStoryVO studyStory = new StudyStoryVO();
studyStory.setId(storyListen.getId());
@@ -2003,6 +2022,9 @@
public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
// 看图配音信息
TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
+ if (storyListen==null){
+ return R.fail("当前未配置框架记忆信息");
+ }
// 题组信息
StudyStoryVO studyStory = new StudyStoryVO();
studyStory.setId(storyListen.getId());
--
Gitblit v1.7.1