From 401510af482a05aa777db983791f8e7594edaec2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 七月 2025 13:53:55 +0800
Subject: [PATCH] 新增迭代
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 239 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 184 insertions(+), 55 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..06191f1 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,13 @@
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.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 +35,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 +106,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 +120,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 +152,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 +166,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);
@@ -187,18 +189,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, 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());
collect.addAll(collect2);
- if (collect.isEmpty()){
+ if (collect.isEmpty()) {
collect.add(-1);
}
wrapper.in("firstCategory", collect);
@@ -218,8 +220,8 @@
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);
@@ -235,8 +237,8 @@
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);
@@ -251,8 +253,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(list2);
@@ -267,8 +269,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());
}
if (!tSubject.getError().isEmpty()) {
tSubjects3.add(tSubject);
@@ -283,8 +285,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(list4);
@@ -312,6 +314,7 @@
.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();
@@ -430,6 +433,7 @@
tStudyListen.setIntegral(studyListenDTO.getIntegral());
tStudyListen.setWeek(week);
tStudyListen.setIsVip(studyListenDTO.getIsVip());
+ tStudyListen.setRate(dto.getListenRate());
studyListenService.save(tStudyListen);
}
studyLookService.remove(new QueryWrapper<TStudyLook>()
@@ -446,6 +450,8 @@
tStudyLook.setIntegral(studyLookDTO.getIntegral());
tStudyLook.setWeek(week);
tStudyLook.setIsVip(studyLookDTO.getIsVip());
+ tStudyLook.setRate(dto.getLookRate());
+
studyLookService.save(tStudyLook);
}
studyInductionService.remove(new QueryWrapper<TStudyInduction>()
@@ -460,6 +466,8 @@
tStudyInduction.setSubject(studyInductionDTO.getSubject());
tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
tStudyInduction.setWeek(week);
+ tStudyInduction.setRate(dto.getInductionRate());
+
tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
studyInductionService.save(tStudyInduction);
}
@@ -477,6 +485,8 @@
tStudyAnswer.setAnswerSubject(studyAnswerDTO.getAnswerSubject());
tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
tStudyAnswer.setWeek(week);
+ tStudyAnswer.setRate(dto.getAnswerRate());
+
tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
studyAnswerService.save(tStudyAnswer);
}
@@ -492,6 +502,7 @@
tStudyPair.setSubject(studyPairDTO.getSubject());
tStudyPair.setIntegral(studyPairDTO.getIntegral());
tStudyPair.setWeek(week);
+ tStudyPair.setRate(dto.getPairRate());
tStudyPair.setIsVip(studyPairDTO.getIsVip());
studyPairService.save(tStudyPair);
}
@@ -500,9 +511,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 +538,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 +556,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 +565,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 +573,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 +690,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<>();
@@ -702,7 +715,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(",");
}
}
@@ -713,6 +726,7 @@
studyListenVO.setIsVip(tStudyListen.getIsVip());
listenVOS.add(studyListenVO);
}
+ res.setListenRate(tStudyListen.getRate());
}
// 看音选图
@@ -728,7 +742,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(",");
@@ -745,6 +759,7 @@
studyLookVO1.setIsVip(tStudyLook.getIsVip());
lookVOS.add(studyLookVO1);
}
+ res.setLookRate(tStudyLook.getRate());
}
// 归纳排除
@@ -759,7 +774,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(",");
}
}
@@ -770,6 +785,7 @@
studyInductionVO.setIsVip(tStudyInduction.getIsVip());
inductionVOS.add(studyInductionVO);
}
+ res.setInductionRate(tStudyInduction.getRate());
}
// 有问有答
@@ -784,27 +800,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(",");
}
}
@@ -818,6 +834,8 @@
studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
answerVOS.add(studyAnswerVO);
+ res.setAnswerRate(tStudyAnswer.getRate());
+
}
}
@@ -833,7 +851,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(",");
}
}
@@ -844,6 +862,8 @@
studyPairVO.setIsVip(tStudyPair.getIsVip());
pairVOS.add(studyPairVO);
}
+ res.setPairRate(tStudyPair.getRate());
+
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -875,7 +895,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 +904,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 +991,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 +1001,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);
@@ -1020,6 +1058,58 @@
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);
}
@@ -1044,6 +1134,7 @@
List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid());
return R.ok(result);
}
+
/**
* 获取在线时间赠送积分信息
@@ -1314,7 +1405,6 @@
@RequestParam Integer day) {
// 判断当前登录用户是否为 会员
Boolean isVip = userService.isVip();
-
// 非会员只能查看非会员题目，会员可以查看所有题目
List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
for (TStudyListen studyListen : studyListens) {
@@ -1326,7 +1416,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 +1447,7 @@
}
}
}
- return R.ok(studyService.pictureSelectVoice(week, day, lookList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.pictureSelectVoice(week, day, lookList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1388,7 +1478,7 @@
}
}
}
- return R.ok(studyService.induceExclude(week, day, inductionList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.induceExclude(week, day, inductionList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1419,7 +1509,7 @@
}
}
}
- return R.ok(studyService.questionsAndAnswers(week, day, answerList,tokenService.getLoginUserStudy().getUserid()));
+ return studyService.questionsAndAnswers(week, day, answerList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1450,12 +1540,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 = {"学习端-听-自主学习"})
@@ -1470,9 +1559,9 @@
subjectRecordDetailService.updateById(byId);
return R.ok();
}
+
/**
* 2.0新增-重新开始
- *
*/
@PostMapping("/restart")
@ApiOperation(value = "2.0新增-重新开始", tags = {"学习端-听-自主学习"})
@@ -1597,6 +1686,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("请选择符合规则的游戏难度！");
@@ -1642,6 +1748,23 @@
LoginUserParent userStudy = tokenService.getLoginUserStudy();
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) {
@@ -1875,6 +1998,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 +2024,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