From afb2bc8e77e086ebeb358915e12fad41dac78a6a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 14:41:34 +0800
Subject: [PATCH] 1020更新
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 374 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 285 insertions(+), 89 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 be1178f..6f3f1f6 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
@@ -1,11 +1,14 @@
package com.ruoyi.study.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
+import com.ruoyi.common.core.web.domain.BaseModel;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.api.feignClient.GoodsClient;
@@ -33,6 +36,8 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
@@ -102,14 +107,12 @@
subjectRecordDetailService.save(tSubjectRecordDetail);
-
-
-
return R.ok();
}
@Autowired
private ICategoryService categoryService;
+
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
@@ -118,18 +121,18 @@
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
- if (StringUtils.hasLength(query.getCategoryName())){
+ if (StringUtils.hasLength(query.getCategoryName())) {
// 查询分类id包含的
List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2)
- .eq(TCategory::getType,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, 2)
- .eq(TCategory::getType,2)
+ .eq(TCategory::getType, 2)
.like(TCategory::getName, query.getCategoryName()).list()
.stream().map(TCategory::getParentId).collect(Collectors.toList());
collect.addAll(collect2);
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
collect.add(-1);
}
wrapper.in("firstCategory", collect);
@@ -150,8 +153,8 @@
TCategory first = categoryService.getById(tSubject.getFirstCategory());
TCategory second = categoryService.getById(tSubject.getSecondCategory());
- if (first!=null&& second!=null){
- tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ if (first != null && second != null) {
+ tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
}
res.setRecords(list);
@@ -164,8 +167,8 @@
for (TStory tStory : list1) {
TCategory first = categoryService.getById(tStory.getFirstCategory());
TCategory second = categoryService.getById(tStory.getSecondCategory());
- if (first!=null&& second!=null){
- tStory.setCategoryName(first.getName()+"-"+second.getName());
+ if (first != null && second != null) {
+ tStory.setCategoryName(first.getName() + "-" + second.getName());
}
}
res.setRecords(list1);
@@ -181,27 +184,32 @@
@PostMapping("/subjectList")
// @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
- public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
- PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
+ public R<IPage<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
+ // 创建分页对象，传入当前页和每页显示条数
+ IPage<TSubject> page = new Page<>(query.getPageNumber(), query.getPageSize()); QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
- if (StringUtils.hasLength(query.getCategoryName())){
+ if (StringUtils.hasLength(query.getCategoryName())) {
// 查询分类id包含的
List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
- .eq(TCategory::getType,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)
+ .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());
@@ -209,21 +217,22 @@
if (StringUtils.hasLength(query.getType())) {
wrapper.like("type", query.getType());
}
+ List<TCategory> list5 = categoryService.list();
wrapper.eq("state", 1);
+ // 执行分页查询
+ IPage<TSubject> res = subjectService.page(page, wrapper);
+ List<TSubject> list = res.getRecords();
+
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());
+ 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());
}
}
res.setRecords(list);
- res.setTotal(list.size());
return R.ok(res);
case 2:
// 查询出error字段不为空的数据
@@ -231,32 +240,29 @@
List<TSubject> list1 = subjectService.list(wrapper);
List<TSubject> tSubjects = new ArrayList<>();
for (TSubject tSubject : list1) {
- TCategory first = categoryService.getById(tSubject.getFirstCategory());
+ 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);
- TCategory second = categoryService.getById(tSubject.getSecondCategory());
-
- if (first!=null&&second!=null){
- tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ if (first != null && second != null) {
+ tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
if (!tSubject.getError().isEmpty()) {
tSubjects.add(tSubject);
}
}
res.setRecords(tSubjects);
- res.setTotal(tSubjects.size());
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());
+ 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());
+ if (first != null && second != null) {
+ tSubject.setCategoryName(first.getName() + "-" + second.getName());
}
}
res.setRecords(list2);
- res.setTotal(list2.size());
return R.ok(res);
case 4:
// 查询出error字段不为空的数据
@@ -264,31 +270,27 @@
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());
+ 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());
}
if (!tSubject.getError().isEmpty()) {
tSubjects3.add(tSubject);
}
}
res.setRecords(tSubjects3);
- res.setTotal(tSubjects3.size());
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());
+ 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());
}
}
res.setRecords(list4);
- res.setTotal(list4.size());
return R.ok(res);
}
List<TSubject> objects = new ArrayList<>();
@@ -312,10 +314,12 @@
.eq("week", week)
.eq("type", type));
one.setQuarter(dto.getQuarter());
+ one.setQuarterRate(dto.getQuarterRate());
one.setTitle(dto.getTitle());
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>()
@@ -347,6 +351,8 @@
studyId.setAnswerCount(game.getAnswerCount());
studyId.setRate(game.getRate());
studyId.setAnswerRate(game.getAnswerRate());
+ studyId.setSubjectIds(game.getSubjectIds());
+ studyId.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.updateById(studyId);
} else {
// 判断当前周目配置的题目数量
@@ -375,6 +381,8 @@
tGame.setAnswerTime(game.getAnswerTime());
tGame.setAnswerIntegral(game.getAnswerIntegral());
tGame.setAnswerCount(game.getAnswerCount());
+ tGame.setSubjectIds(game.getSubjectIds());
+ tGame.setSubjectIdsOne(game.getSubjectIdsOne());
gameService.save(tGame);
}
@@ -416,6 +424,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())
@@ -430,7 +447,18 @@
tStudyListen.setIntegral(studyListenDTO.getIntegral());
tStudyListen.setWeek(week);
tStudyListen.setIsVip(studyListenDTO.getIsVip());
+ tStudyListen.setRate(dto.getListenRate());
+ tStudyListen.setStudySort(studyListenDTO.getStudySort());
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())
@@ -446,7 +474,18 @@
tStudyLook.setIntegral(studyLookDTO.getIntegral());
tStudyLook.setWeek(week);
tStudyLook.setIsVip(studyLookDTO.getIsVip());
+ tStudyLook.setRate(dto.getLookRate());
+ tStudyLook.setStudySort(studyLookDTO.getStudySort());
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())
@@ -460,8 +499,20 @@
tStudyInduction.setSubject(studyInductionDTO.getSubject());
tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
tStudyInduction.setWeek(week);
+ tStudyInduction.setRate(dto.getInductionRate());
tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
+ tStudyInduction.setStudySort(studyInductionDTO.getStudySort());
+
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())
@@ -477,8 +528,21 @@
tStudyAnswer.setAnswerSubject(studyAnswerDTO.getAnswerSubject());
tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
tStudyAnswer.setWeek(week);
+ tStudyAnswer.setRate(dto.getAnswerRate());
tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
+ tStudyAnswer.setStudySort(studyAnswerDTO.getStudySort());
+
+
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())
@@ -492,7 +556,9 @@
tStudyPair.setSubject(studyPairDTO.getSubject());
tStudyPair.setIntegral(studyPairDTO.getIntegral());
tStudyPair.setWeek(week);
+ tStudyPair.setRate(dto.getPairRate());
tStudyPair.setIsVip(studyPairDTO.getIsVip());
+ tStudyPair.setStudySort(studyPairDTO.getStudySort());
studyPairService.save(tStudyPair);
}
}
@@ -500,9 +566,10 @@
}
public static void main(String[] args) throws Exception {
- double temp =1.687;
- System.err.println((int)temp);
+ double temp = 1.687;
+ System.err.println((int) temp);
}
+
/**
* 添加周目
*
@@ -526,7 +593,7 @@
studyService.saveOrUpdate(tStudy);
}
// 每次添加周目后需要根据季度来重新排序周目
- if (dto.getType() == 1){
+ if (dto.getType() == 1) {
List<TStudy> list1 = studyService.lambdaQuery()
.eq(TStudy::getType, 1)
.orderByAsc(TStudy::getQuarter)
@@ -544,7 +611,7 @@
System.err.println("进入修改");
tStudy.setWeek(i);
// 将对应的题目配置修改week
- List<TGame> games1 = games.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TGame> games1 = games.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TGame tGame : games1) {
tGame.setWeek(i);
tGame.setStudyId(tStudy.getId());
@@ -553,7 +620,7 @@
}
// 听故事
- List<TStoryListen> storyListens1 = storyListens.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStoryListen> storyListens1 = storyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStoryListen tStoryListen : storyListens1) {
tStoryListen.setWeek(i);
tStoryListen.setStudyId(tStudy.getId());
@@ -561,36 +628,36 @@
}
// 听音选图
- List<TStudyListen> studyListens1 = studyListens.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStudyListen> studyListens1 = studyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStudyListen tStudyListen : studyListens1) {
tStudyListen.setWeek(i);
tStudyListen.setStudyId(tStudy.getId());
studyListenService.updateById(tStudyListen);
}
// 看图选音
- List<TStudyLook>studyLooks1 = studyLooks.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStudyLook> studyLooks1 = studyLooks.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStudyLook tStudyLook : studyLooks1) {
tStudyLook.setWeek(i);
tStudyLook.setStudyId(tStudy.getId());
studyLookService.updateById(tStudyLook);
}
// 归纳判断
- List<TStudyInduction> studyInductions1 = studyInductions.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStudyInduction> studyInductions1 = studyInductions.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStudyInduction tStudyInduction : studyInductions1) {
tStudyInduction.setWeek(i);
tStudyInduction.setStudyId(tStudy.getId());
- System.err.println("归纳判断"+tStudy.getId());
+ System.err.println("归纳判断" + tStudy.getId());
studyInductionService.updateById(tStudyInduction);
}
- List<TStudyAnswer> studyAnswers1 = studyAnswers.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStudyAnswer> studyAnswers1 = studyAnswers.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStudyAnswer tStudyAnswer : studyAnswers1) {
tStudyAnswer.setStudyId(tStudy.getId());
tStudyAnswer.setWeek(i);
studyAnswerService.updateById(tStudyAnswer);
}
- List<TStudyPair> studyPairs1 = studyPairs.stream().filter(e->e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
+ List<TStudyPair> studyPairs1 = studyPairs.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
for (TStudyPair tStudyPair : studyPairs1) {
tStudyPair.setWeek(i);
tStudyPair.setStudyId(tStudy.getId());
@@ -678,6 +745,7 @@
if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
+ res.setQuarterRate(list8.get(0).getQuarterRate());
}
List<StudyListenVO> listenVOS = new ArrayList<>();
List<GameVO> gameVOS = new ArrayList<>();
@@ -693,7 +761,7 @@
// 听音选图
List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
.eq("week", week)
- .eq("day", day));
+ .eq("day", day).orderByAsc("studySort"));
List<TSubject> list9 = subjectService.list();
for (TStudyListen tStudyListen : list) {
@@ -702,7 +770,7 @@
if (StringUtils.hasLength(tStudyListen.getSubject())) {
for (String s : tStudyListen.getSubject().split(",")) {
TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
temp.append(byId.getName()).append(",");
}
}
@@ -711,14 +779,17 @@
studyListenVO.setIntegral(tStudyListen.getIntegral());
studyListenVO.setSubject(tStudyListen.getSubject());
studyListenVO.setIsVip(tStudyListen.getIsVip());
+ studyListenVO.setId(tStudyListen.getId());
+ studyListenVO.setType(tStudyListen.getType());
listenVOS.add(studyListenVO);
}
+ res.setListenRate(tStudyListen.getRate());
}
// 看音选图
List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
.eq("week", week)
- .eq("day", day)
+ .eq("day", day).orderByAsc("studySort")
);
for (TStudyLook tStudyLook : list1) {
int index = 0;
@@ -728,7 +799,7 @@
if (StringUtils.hasLength(tStudyLook.getSubject())) {
for (String s : tStudyLook.getSubject().split(",")) {
TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
String[] split = tStudyLook.getSort().split(",");
@@ -743,14 +814,17 @@
studyLookVO1.setIntegral(tStudyLook.getIntegral());
studyLookVO1.setSubject(tStudyLook.getSubject());
studyLookVO1.setIsVip(tStudyLook.getIsVip());
+ studyLookVO1.setId(tStudyLook.getId());
+
lookVOS.add(studyLookVO1);
}
+ res.setLookRate(tStudyLook.getRate());
}
// 归纳排除
List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
.eq("week", week)
- .eq("day", day)
+ .eq("day", day).orderByAsc("studySort")
);
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
@@ -759,7 +833,7 @@
for (String s : tStudyInduction.getSubject().split(",")) {
String replace = s.replace("-", "");
TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(replace))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
}
@@ -768,14 +842,17 @@
studyInductionVO.setIntegral(tStudyInduction.getIntegral());
studyInductionVO.setSubject(tStudyInduction.getSubject());
studyInductionVO.setIsVip(tStudyInduction.getIsVip());
+ studyInductionVO.setId(tStudyInduction.getId());
+
inductionVOS.add(studyInductionVO);
}
+ res.setInductionRate(tStudyInduction.getRate());
}
// 有问有答
List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
.eq("week", week)
- .eq("day", day));
+ .eq("day", day).orderByAsc("studySort"));
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
@@ -784,27 +861,27 @@
if (tStudyAnswer.getSubject() != null) {
TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
}
if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
- if (byId1!=null){
+ if (byId1 != null) {
names.append(byId1.getName()).append(",");
}
}
} else {
if (tStudyAnswer.getSubject() != null) {
TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
}
if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
- if (byId1!=null){
+ if (byId1 != null) {
names.append(byId1.getName()).append(",");
}
}
@@ -817,14 +894,18 @@
studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
+ studyAnswerVO.setId(tStudyAnswer.getId());
+
answerVOS.add(studyAnswerVO);
+ res.setAnswerRate(tStudyAnswer.getRate());
+
}
}
// 音图相配
List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
.eq("week", week)
- .eq("day", day)
+ .eq("day", day).orderByAsc("studySort")
);
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
@@ -833,7 +914,7 @@
for (String s : tStudyPair.getSubject().split(",")) {
TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
}
@@ -842,8 +923,11 @@
studyPairVO.setIntegral(tStudyPair.getIntegral());
studyPairVO.setSubject(tStudyPair.getSubject());
studyPairVO.setIsVip(tStudyPair.getIsVip());
+ studyPairVO.setId(tStudyPair.getId());
pairVOS.add(studyPairVO);
}
+ res.setPairRate(tStudyPair.getRate());
+
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -857,6 +941,16 @@
gameVO.setAnswerCount(tGame.getAnswerCount());
gameVO.setRate(tGame.getRate());
gameVO.setAnswerRate(tGame.getAnswerRate());
+ String subjectIds = tGame.getSubjectIds();
+ if(subjectIds!=null && subjectIds.length()>0){
+ gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
+ .in("id", subjectIds.split(","))));
+ }
+ String subjectIdsOne = tGame.getSubjectIdsOne();
+ if(subjectIdsOne!=null && subjectIdsOne.length()>0){
+ gameVO.setSubjectsOne(subjectService.list(new QueryWrapper<TSubject>()
+ .in("id", subjectIdsOne.split(","))));
+ }
gameVOS.add(gameVO);
}
List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
@@ -875,7 +969,7 @@
if (StringUtils.hasLength(tStory.getStory())) {
for (String s : tStory.getStory().split(",")) {
TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names.append(byId.getName()).append(",");
}
}
@@ -884,7 +978,7 @@
for (String s : tStory.getLookStory().split(",")) {
TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
- if (byId!=null){
+ if (byId != null) {
names1.append(byId.getName()).append(",");
}
}
@@ -971,7 +1065,7 @@
@GetMapping("/studySchedule")
@ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
})
public R<TUserStudy> studySchedule(@RequestParam Integer week) {
LoginUserParent loginStudy = tokenService.getLoginUserStudy();
@@ -981,6 +1075,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);
@@ -1044,6 +1156,7 @@
List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid());
return R.ok(result);
}
+
/**
* 获取在线时间赠送积分信息
@@ -1314,7 +1427,6 @@
@RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
-
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
for (TStudyListen studyListen : studyListens) {
@@ -1326,7 +1438,7 @@
}
}
}
- return R.ok(studyService.listenSelectPicture(week, day, studyListens,tokenService.getLoginUserStudy().getUserid()));
+ return R.ok(studyService.listenSelectPicture(week, day, studyListens, tokenService.getLoginUserStudy().getUserid()));
}
/**
@@ -1357,7 +1469,7 @@
}
}
}
- return R.ok(studyService.pictureSelectVoice(week, day, lookList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.pictureSelectVoice(week, day, lookList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1388,7 +1500,7 @@
}
}
}
- return R.ok(studyService.induceExclude(week, day, inductionList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.induceExclude(week, day, inductionList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1419,7 +1531,7 @@
}
}
}
- return R.ok(studyService.questionsAndAnswers(week, day, answerList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.questionsAndAnswers(week, day, answerList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1450,12 +1562,11 @@
}
}
}
- return R.ok(studyService.pictureMateVoice(week, day, pairList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.pictureMateVoice(week, day, pairList, tokenService.getLoginUserStudy().getUserid());
}
/**
* 2.0新增-记录答题状态
- *
*/
@PostMapping("/answerQuestion")
@ApiOperation(value = "2.0新增-记录答题状态", tags = {"学习端-听-自主学习"})
@@ -1464,15 +1575,16 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ System.err.println("答题DTO"+answerQuestionDTO);
TSubjectRecordDetail byId = subjectRecordDetailService.getById(answerQuestionDTO.getId());
byId.setUserId(null);
byId.setStatus(answerQuestionDTO.getStatus());
subjectRecordDetailService.updateById(byId);
return R.ok();
}
+
/**
* 2.0新增-重新开始
- *
*/
@PostMapping("/restart")
@ApiOperation(value = "2.0新增-重新开始", tags = {"学习端-听-自主学习"})
@@ -1597,6 +1709,23 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
+ .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();
+ if (listenSize!=0){
+ // 先计算上一天的通关率 设置为两位小数
+ double listenRate = (double) listenPass /listenSize;
+ BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP);
+ TStudyPair one = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDay, 5).last("limit 1").one();
+ if (one!=null){
+ if (listenRate<(Double.parseDouble(one.getRate())/100)){
+ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
+ }
+ }
+ }
Integer[] array = {0, 1, 2};
if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) {
throw new GlobalException("请选择符合规则的游戏难度！");
@@ -1609,7 +1738,19 @@
game.setTime(game.getTime().split(",")[difficulty]);
// 检验是否完成难度
studyService.checkDifficulty(difficulty, week, game, userStudy.getUserid());
- List<String> subjectId = getSubjectId(week);
+
+
+// List<String> subjectId = getSubjectId(week);
+ List<String> subjectId = new ArrayList<>();
+ String subjectIds = game.getSubjectIds();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
+ }
+
+
List<String> newSubjectId = subjectId.stream().map(data -> {
if (data.startsWith(Constants.REDUCE)) {
data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
@@ -1643,11 +1784,37 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
+ .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();
+ if (listenSize!=0){
+ // 先计算上一天的通关率 设置为两位小数
+ double listenRate = (double) listenPass /listenSize;
+ BigDecimal divide = new BigDecimal(listenPass).divide(new BigDecimal(listenSize), 2, RoundingMode.HALF_UP);
+ TStudyPair one = studyPairService.lambdaQuery().eq(TStudyPair::getWeek, week)
+ .eq(TStudyPair::getDay, 5).last("limit 1").one();
+ if (one!=null){
+ if (listenRate<(Double.parseDouble(one.getRate())/100)){
+ return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
+ }
+ }
+ }
TGame game = gameService.gameHearing(quarter, week);
if (null == game) {
throw new GlobalException("当前季度该周目暂无配置游戏数据！");
}
- List<String> subjectId = getSubjectId(week);
+// List<String> subjectId = getSubjectId(week);
+ List<String> subjectId = new ArrayList<>();
+ String subjectIds = game.getSubjectIdsOne();
+ if(subjectIds!=null){
+ String[] split = subjectIds.split(",");
+ for (String s : split) {
+ subjectId.add(s);
+ }
+ }
+
List<String> subjectData = getSubjectData(game, subjectId);
List<TSubject> subjectList = getSubjectList(subjectData);
// 返回数据
@@ -1657,6 +1824,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());
// 框架记忆数量翻倍，前端需要根据数量画格子
@@ -1875,6 +2044,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());
@@ -1898,6 +2070,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());
@@ -2325,5 +2500,26 @@
return R.ok(userService.updateById(user));
}
+ @GetMapping("/lookVideo")
+// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+ public R<Boolean> lookVideo() {
+ boolean update = userService.update(new LambdaUpdateWrapper<TUser>().set(TUser::getLookVideo, 0));
+ return R.ok(update);
+ }
+
+ /**
+ * 设置题组类型 常规 示例
+ * @param dto
+ * @return
+ */
+ @PostMapping("/setStudyType")
+ public R<Object> setStudyType(@RequestBody SetStudyTypeDto dto){
+ TStudyListen studyListen = studyListenService.getById(dto.getId());
+ studyListen.setType(dto.getType());
+ studyListen.setSubject(dto.getSubject());
+ return R.ok(studyListenService.updateById(studyListen));
+
+ }
+
}
--
Gitblit v1.7.1