From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 142 insertions(+), 24 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 f79a4a3..26c0859 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
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import kotlin.random.Random;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -145,6 +146,8 @@
return R.ok();
}
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
@@ -152,6 +155,22 @@
QueryWrapper<TStory> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
+ }
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ .eq(TCategory::getType,1)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
+ List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ .eq(TCategory::getType,2)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
}
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
@@ -165,21 +184,30 @@
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- List<TStory> tSubjects = new ArrayList<>(list);
- res.setRecords(tSubjects);
- res.setTotal(tSubjects.size());
+ for (TStory tSubject : list) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&& second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
+ res.setRecords(list);
+ res.setTotal(list.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
for (TStory tStory : list1) {
- if (tStory.getError() != null && (!tStory.getError().isEmpty())) {
- tStories.add(tStory);
+ TCategory first = categoryService.getById(tStory.getFirstCategory());
+ TCategory second = categoryService.getById(tStory.getSecondCategory());
+ if (first!=null&& second!=null){
+ tStory.setCategoryName(first.getName()+"-"+second.getName());
}
}
- res.setRecords(tStories);
- res.setTotal(tStories.size());
+ res.setRecords(list1);
+ res.setTotal(list1.size());
return R.ok(res);
}
@@ -197,6 +225,22 @@
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
+ .eq(TCategory::getType,1)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
+ 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());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
+ }
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
}
@@ -207,6 +251,15 @@
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());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list);
res.setTotal(list.size());
return R.ok(res);
@@ -216,6 +269,13 @@
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());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects.add(tSubject);
}
@@ -225,6 +285,14 @@
return R.ok(res);
case 3:
List<TSubject> list2 = subjectService.list(wrapper);
+ for (TSubject tSubject : list2) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list2);
res.setTotal(list2.size());
return R.ok(res);
@@ -234,6 +302,12 @@
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());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects3.add(tSubject);
}
@@ -243,6 +317,14 @@
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
+ for (TSubject tSubject : list4) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list4);
res.setTotal(list4.size());
return R.ok(res);
@@ -278,6 +360,21 @@
.eq("studyId", one.getId())
.eq("week", week));
if (studyId != null) {
+ // 判断当前周目配置的题目数量
+ List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
+ // 判断周目下题目是否足够
+ if (newSubjectId.size() < game.getCount()) {
+ return R.fail("超级听力：当前周目下day1 - day5题目不足！");
+ }
+ if (newSubjectId.size() < game.getAnswerCount()) {
+ return R.fail("超级记忆：当前周目下day1 - day5题目不足！");
+ }
studyId.setWeek(dto.getWeek());
studyId.setStudyId(one.getId());
studyId.setCount(game.getCount());
@@ -290,6 +387,21 @@
studyId.setAnswerRate(game.getAnswerRate());
gameService.updateById(studyId);
} else {
+ // 判断当前周目配置的题目数量
+ List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
+ // 判断周目下题目是否足够
+ if (newSubjectId.size() < game.getCount()) {
+ return R.fail("超级听力：当前周目下day1 - day5题目不足！");
+ }
+ if (newSubjectId.size() < game.getAnswerCount()) {
+ return R.fail("超级记忆：当前周目下day1 - day5题目不足！");
+ }
TGame tGame = new TGame();
tGame.setWeek(dto.getWeek());
tGame.setAnswerRate(game.getAnswerRate());
@@ -450,6 +562,21 @@
tStudy.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(tStudy);
}
+ // 每次添加周目后需要根据季度来重新排序周目
+ if (dto.getType() == 1){
+ List<TStudy> list1 = studyService.lambdaQuery()
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getQuarter)
+ .orderByAsc(TStudy::getWeek)
+ .list();
+ int i = 1;
+ for (TStudy tStudy : list1) {
+ tStudy.setWeek(i);
+ i++;
+ }
+ studyService.updateBatchById(list1);
+ }
+
return R.ok();
}
@@ -522,7 +649,8 @@
res.setWeeks(type);
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
- .eq("week", dto.getWeek()));
+ .eq("week", dto.getWeek())
+ .orderByAsc("quarter"));
if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
@@ -1022,9 +1150,7 @@
item += studyListen.getSubject().split(",").length;
}
int i = (int) (((double) schedule / item) * 100);
- if (i > userStudy.getListen()) {
- userStudy.setListen(i);
- }
+ userStudy.setListen(i);
}
}
} else if (Constants.TWO.equals(type)) {
@@ -1037,9 +1163,7 @@
if (!lookList.isEmpty()) {
int item = lookList.size();
int i = (int) (((double) schedule / item) * 100);
- if (i > userStudy.getLook()) {
- userStudy.setLook(i);
- }
+ userStudy.setLook(i);
}
}
}
@@ -1053,9 +1177,7 @@
if (!inductionList.isEmpty()) {
int item = inductionList.size();
int i = (int) (((double) schedule / item) * 100);
- if (i > userStudy.getInduction()) {
- userStudy.setInduction(i);
- }
+ userStudy.setInduction(i);
}
}
}
@@ -1068,9 +1190,7 @@
List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
if (answerList.size() % Constants.TWO == Constants.ZERO) {
int i = (int) (((double) schedule / (answerList.size() / 2)) * 100);
- if (i > userStudy.getAnswer()) {
- userStudy.setAnswer(i);
- }
+ userStudy.setAnswer(i);
}
}
}
@@ -1084,9 +1204,7 @@
if (!pairList.isEmpty()) {
int item = pairList.size();
int i = (int) (((double) schedule / item) * 100);
- if (i > userStudy.getPair()) {
- userStudy.setPair(i);
- }
+ userStudy.setPair(i);
}
}
}
@@ -1466,7 +1584,7 @@
private List<String> getData(TGame game, List<String> newSubjectId, int num) {
List<String> subjectData = new ArrayList<>();
- Random random = new Random();
+ java.util.Random random = new java.util.Random();
// 获取列表大小
int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
--
Gitblit v1.7.1