From 984dc83c2e93ee05d8ea57db5beec76a773d4716 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 04 七月 2025 18:08:49 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 754 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 661 insertions(+), 93 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 ab871ee..c76eac0 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;
@@ -21,11 +23,23 @@
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.sound.sampled.*;
+import java.io.BufferedInputStream;
+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;
import java.util.*;
import java.util.stream.Collectors;
@@ -81,6 +95,22 @@
private ManagementClient managementClient;
@Resource
private ITUserPresentRecordService userPresentRecordService;
+ @Resource
+ private ITSubjectRecordDetailService subjectRecordDetailService;
+
+ @PostMapping("/testAddData")
+ @ApiOperation(value = "测试分片", tags = {"测试分片"})
+ public R<Object> testAddData() {
+ TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail();
+ tSubjectRecordDetail.setUserId(12);
+ subjectRecordDetailService.save(tSubjectRecordDetail);
+
+
+ return R.ok();
+ }
+
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -90,6 +120,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, 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());
}
@@ -97,22 +143,33 @@
wrapper.like("type", query.getType());
}
wrapper.eq("state", 1);
+ List<TStory> tStories = new ArrayList<>();
+
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- List<TStory> tSubjects = new ArrayList<>();
for (TStory tSubject : list) {
- if (!tSubject.getError().isEmpty()) {
- tSubjects.add(tSubject);
+ 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(tSubjects);
- res.setTotal(tSubjects.size());
+ 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) {
+ 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(list1);
res.setTotal(list1.size());
return R.ok(res);
@@ -132,6 +189,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());
}
@@ -142,6 +215,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);
@@ -151,6 +233,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);
}
@@ -160,6 +249,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);
@@ -169,6 +266,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);
}
@@ -178,6 +281,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);
@@ -203,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();
@@ -213,6 +325,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());
@@ -225,6 +352,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());
@@ -291,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>()
@@ -307,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>()
@@ -321,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);
}
@@ -338,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);
}
@@ -353,11 +502,17 @@
tStudyPair.setSubject(studyPairDTO.getSubject());
tStudyPair.setIntegral(studyPairDTO.getIntegral());
tStudyPair.setWeek(week);
+ tStudyPair.setRate(dto.getPairRate());
tStudyPair.setIsVip(studyPairDTO.getIsVip());
studyPairService.save(tStudyPair);
}
}
return R.ok();
+ }
+
+ public static void main(String[] args) throws Exception {
+ double temp = 1.687;
+ System.err.println((int) temp);
}
/**
@@ -372,10 +527,7 @@
.eq("week", dto.getWeek())
.eq("type", dto.getType()));
if (one != null) {
- one.setType(dto.getType());
- one.setWeek(dto.getWeek());
one.setTitle(dto.getTitle());
- one.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(one);
} else {
TStudy tStudy = new TStudy();
@@ -385,6 +537,82 @@
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;
+ List<TGame> games = gameService.list(new QueryWrapper<TGame>());
+ List<TStoryListen> storyListens = storyListenService.list(new QueryWrapper<TStoryListen>());
+ List<TStudyListen> studyListens = studyListenService.list();
+ List<TStudyLook> studyLooks = studyLookService.list();
+ List<TStudyInduction> studyInductions = studyInductionService.list();
+ List<TStudyAnswer> studyAnswers = studyAnswerService.list();
+ List<TStudyPair> studyPairs = studyPairService.list();
+ for (TStudy tStudy : list1) {
+ System.err.println("进入修改");
+ tStudy.setWeek(i);
+ // 将对应的题目配置修改week
+ 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());
+ gameService.updateById(tGame);
+
+
+ }
+ // 听故事
+ 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());
+ storyListenService.updateById(tStoryListen);
+
+ }
+ // 听音选图
+ 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());
+ 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());
+ for (TStudyInduction tStudyInduction : studyInductions1) {
+ tStudyInduction.setWeek(i);
+ tStudyInduction.setStudyId(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());
+ 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());
+ for (TStudyPair tStudyPair : studyPairs1) {
+ tStudyPair.setWeek(i);
+ tStudyPair.setStudyId(tStudy.getId());
+ studyPairService.updateById(tStudyPair);
+ }
+ i++;
+ }
+ studyService.updateBatchById(list1);
+ }
+
return R.ok();
}
@@ -457,10 +685,12 @@
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());
+ res.setQuarterRate(list8.get(0).getQuarterRate());
}
List<StudyListenVO> listenVOS = new ArrayList<>();
List<GameVO> gameVOS = new ArrayList<>();
@@ -477,13 +707,17 @@
List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
.eq("week", week)
.eq("day", day));
+ List<TSubject> list9 = subjectService.list();
+
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
if (StringUtils.hasLength(tStudyListen.getSubject())) {
for (String s : tStudyListen.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- temp.append(byId.getName()).append(",");
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
+ if (byId != null) {
+ temp.append(byId.getName()).append(",");
+ }
}
String string = temp.toString();
studyListenVO.setName(string.substring(0, string.length() - 1));
@@ -492,6 +726,7 @@
studyListenVO.setIsVip(tStudyListen.getIsVip());
listenVOS.add(studyListenVO);
}
+ res.setListenRate(tStudyListen.getRate());
}
// 看音选图
@@ -506,8 +741,10 @@
StudyLookVO studyLookVO1 = new StudyLookVO();
if (StringUtils.hasLength(tStudyLook.getSubject())) {
for (String s : tStudyLook.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
String[] split = tStudyLook.getSort().split(",");
String s1 = split[index];
sorts.append(s1).append(",");
@@ -522,6 +759,7 @@
studyLookVO1.setIsVip(tStudyLook.getIsVip());
lookVOS.add(studyLookVO1);
}
+ res.setLookRate(tStudyLook.getRate());
}
// 归纳排除
@@ -535,8 +773,10 @@
if (StringUtils.hasLength(tStudyInduction.getSubject())) {
for (String s : tStudyInduction.getSubject().split(",")) {
String replace = s.replace("-", "");
- TSubject byId = subjectService.getById(replace);
- names.append(byId.getName()).append(",");
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(replace))).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
}
String string = names.toString();
studyInductionVO.setName(string.substring(0, string.length() - 1));
@@ -545,6 +785,7 @@
studyInductionVO.setIsVip(tStudyInduction.getIsVip());
inductionVOS.add(studyInductionVO);
}
+ res.setInductionRate(tStudyInduction.getRate());
}
// 有问有答
@@ -557,21 +798,31 @@
if (tStudyAnswer.getIsAnswer() != null) {
if (tStudyAnswer.getIsAnswer() == 1) {
if (tStudyAnswer.getSubject() != null) {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
+
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
}
if (tStudyAnswer.getAnswerSubject() != null) {
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
+
+ TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
+ if (byId1 != null) {
+ names.append(byId1.getName()).append(",");
+ }
}
} else {
if (tStudyAnswer.getSubject() != null) {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
}
if (tStudyAnswer.getAnswerSubject() != null) {
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
+ TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
+ if (byId1 != null) {
+ names.append(byId1.getName()).append(",");
+ }
}
}
}
@@ -583,6 +834,8 @@
studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
answerVOS.add(studyAnswerVO);
+ res.setAnswerRate(tStudyAnswer.getRate());
+
}
}
@@ -596,8 +849,11 @@
StudyPairVO studyPairVO = new StudyPairVO();
if (StringUtils.hasLength(tStudyPair.getSubject())) {
for (String s : tStudyPair.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
+
+ TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
}
String string = names.toString();
studyPairVO.setName(string.substring(0, string.length() - 1));
@@ -606,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));
@@ -623,6 +881,9 @@
}
List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
.eq("week", week));
+ List<TStory> list10 = storyService.list();
+
+
for (TStoryListen tStory : list6) {
StoryVO storyVO = new StoryVO();
storyVO.setStory(tStory.getStory());
@@ -633,14 +894,19 @@
StringBuilder sort1 = new StringBuilder();
if (StringUtils.hasLength(tStory.getStory())) {
for (String s : tStory.getStory().split(",")) {
- TStory byId = storyService.getById(s);
- names.append(byId.getName()).append(",");
+ TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
+ if (byId != null) {
+ names.append(byId.getName()).append(",");
+ }
}
}
if (StringUtils.hasLength(tStory.getLookStory())) {
for (String s : tStory.getLookStory().split(",")) {
- TStory byId = storyService.getById(s);
- names1.append(byId.getName()).append(",");
+
+ TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
+ if (byId != null) {
+ names1.append(byId.getName()).append(",");
+ }
}
}
if (StringUtils.hasLength(tStory.getSort())) {
@@ -702,6 +968,22 @@
}
/**
+ * 获取当前季度游戏难度
+ */
+ @GetMapping("/userGameDifficulty")
+ @ApiOperation(value = "获取当前季度游戏难度", tags = {"学习端-首页"})
+ public R<Integer> userGameDifficulty(@RequestParam Integer week) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ return R.ok(studyService.userGameDifficulty(studyRecord, week));
+ }
+
+ /**
* 首次页面加载时调用,获取学习进度及学习时长等信息
*
* @param week 周目
@@ -709,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();
@@ -736,6 +1018,80 @@
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord = studyService.studySchedule(studyRecord, week);
+ // 数据库保存的是已完成的学习进度，返回前端时需要转换为剩余学习进度
+ Integer look = studyRecord.getLook();
+ if (look != 100 && look != -1) {
+ studyRecord.setLook(100 - look);
+ }
+ Integer pair = studyRecord.getPair();
+ if (pair != 100 && pair != -1) {
+ studyRecord.setPair(100 - pair);
+ }
+ Integer answer = studyRecord.getAnswer();
+ if (answer != 100 && answer != -1) {
+ studyRecord.setAnswer(100 - answer);
+ }
+ Integer induction = studyRecord.getInduction();
+ if (induction != 100 && induction != -1) {
+ studyRecord.setInduction(100 - induction);
+ }
+ Integer listen = studyRecord.getListen();
+ 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);
}
@@ -760,6 +1116,7 @@
List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid());
return R.ok(result);
}
+
/**
* 获取在线时间赠送积分信息
@@ -809,7 +1166,7 @@
data.setIsDelete(0);
result = result && userPresentRecordService.save(data);
} else {
- if (System.currentTimeMillis() - record.getPresentTime().getTime() >= 10 * 60 * 1000) {
+ if (System.currentTimeMillis() - record.getPresentTime().getTime() >= (long) Integer.parseInt(sysSet.getTime()) * 60 * 1000) {
// 赠送积分
result = userService.lambdaUpdate()
.set(TUser::getIntegral, user.getIntegral() + Integer.parseInt(integral))
@@ -820,6 +1177,12 @@
data.setPresentTime(new Date());
data.setIsDelete(0);
result = result && userPresentRecordService.save(data);
+ // 生成积分明细
+ TIntegralRecord integralRecord = new TIntegralRecord();
+ integralRecord.setIntegral(sysSet.getIntegral());
+ integralRecord.setMethod(Constants.ONLINE_DURATION);
+ integralRecord.setUserId(loginStudy.getUserid());
+ result = result && integralRecordService.save(integralRecord);
}
}
return R.ok(result);
@@ -852,20 +1215,16 @@
// 返回结果
SubjectRecordResultVO result;
if (null != subjectRecord) {
- subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 1)
- .eq(TSubjectRecord::getId, subjectRecord.getId()).update();
- // 题组id
+ /*// 题组id
List<Integer> teamIds = Arrays.stream(subjectRecord.getBeforeSubject().split(",")).map(Integer::parseInt)
.collect(Collectors.toList());
// 题目id
List<Integer> topicIds = Arrays.stream(subjectRecord.getCompleteSubject().split(",")).map(Integer::parseInt)
- .collect(Collectors.toList());
- result = new SubjectRecordResultVO(teamIds, topicIds, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber());
+ .collect(Collectors.toList());*/
+ result = new SubjectRecordResultVO(null, null, subjectRecord.getAnswerNumber(), subjectRecord.getCorrectNumber(), subjectRecord.getSchedule());
} else {
result = null;
}
- subjectRecordService.lambdaUpdate().set(TSubjectRecord::getDisabled, 0)
- .eq(TSubjectRecord::getUserId, loginStudy.getUserid()).update();
return R.ok(result);
}
@@ -879,7 +1238,18 @@
if (null == loginStudy) {
return R.tokenError("登录失效！");
}
+ // 退出学习如果已经存在中途学习记录，则删除记录，保存新学习记录
Integer userid = loginStudy.getUserid();
+ TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery()
+ .eq(TSubjectRecord::getUserId, userid)
+ .eq(TSubjectRecord::getWeek, exitLearn.getWeek())
+ .eq(TSubjectRecord::getDay, exitLearn.getDay())
+ .eq(TSubjectRecord::getType, exitLearn.getType())
+ .eq(TSubjectRecord::getDisabled, 0)
+ .one();
+ if (null != subjectRecord) {
+ subjectRecordService.removeById(subjectRecord);
+ }
// 判断当前week和day是否已完成学习
TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
.eq(TUserStudy::getDisabled, 0).one();
@@ -889,58 +1259,80 @@
Integer quarter = exitLearn.getQuarter();
Integer week = exitLearn.getWeek();
Integer day = exitLearn.getDay();
- int schedule = exitLearn.getSchedule() == null ? 0 : exitLearn.getSchedule();
+ int schedule = exitLearn.getSchedule() - 1;
if (userStudy.getWeek().equals(exitLearn.getWeek()) && userStudy.getDay().equals(exitLearn.getDay())) {
// 计算完成率
Integer type = exitLearn.getType();
// 更新用户学习完成率
if (Constants.ONE.equals(type)) {
- // 听音选图
- List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
- int item = 0;
- for (TStudyListen studyListen : studyListens) {
- item += studyListen.getSubject().split(",").length;
- }
- int i = (int) ((double) (exitLearn.getTopicIds().split(",").length / item) * 100);
- if (i > userStudy.getListen()) {
- userStudy.setListen(100 - i);
+ if (userStudy.getListen() != 100) {
+ if (1 == exitLearn.getSchedule()) {
+ userStudy.setListen(Constants.BURDEN_ONE);
+ } else {
+ // 听音选图
+ List<TStudyListen> studyListens = studyListenService.listenSelectPicture(quarter, week, day);
+ int item = 0;
+ for (TStudyListen studyListen : studyListens) {
+ item += studyListen.getSubject().split(",").length;
+ }
+ int i = (int) (((double) schedule / item) * 100);
+ userStudy.setListen(i);
+ }
}
} else if (Constants.TWO.equals(type)) {
- // 看图选音
- List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
- if (!lookList.isEmpty()) {
- int item = lookList.size();
- int i = (int) ((double) (schedule / item)) * 100;
- if (i > userStudy.getLook()) {
- userStudy.setLook(100 - i);
+ if (userStudy.getLook() != 100) {
+ if (1 == exitLearn.getSchedule()) {
+ userStudy.setLook(Constants.BURDEN_ONE);
+ } else {
+ // 看图选音
+ List<TStudyLook> lookList = studyLookService.pictureSelectVoice(quarter, week, day);
+ if (!lookList.isEmpty()) {
+ int item = lookList.size();
+ int i = (int) (((double) schedule / item) * 100);
+ userStudy.setLook(i);
+ }
}
}
} else if (Constants.THREE.equals(type)) {
- // 归纳排除
- List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
- if (!inductionList.isEmpty()) {
- int item = inductionList.size();
- int i = (int) ((double) (schedule / item)) * 100;
- if (i > userStudy.getInduction()) {
- userStudy.setInduction(100 - i);
+ if (userStudy.getInduction() != 100) {
+ if (1 == exitLearn.getSchedule()) {
+ userStudy.setInduction(Constants.BURDEN_ONE);
+ } else {
+ // 归纳排除
+ List<TStudyInduction> inductionList = studyInductionService.induceExclude(quarter, week, day);
+ if (!inductionList.isEmpty()) {
+ int item = inductionList.size();
+ int i = (int) (((double) schedule / item) * 100);
+ userStudy.setInduction(i);
+ }
}
}
} else if (Constants.FOUR.equals(type)) {
- // 有问有答
- 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(100 - i);
+ if (userStudy.getAnswer() != 100) {
+ if (1 == exitLearn.getSchedule()) {
+ userStudy.setAnswer(Constants.BURDEN_ONE);
+ } else {
+ // 有问有答
+ List<TStudyAnswer> answerList = studyAnswerService.questionsAndAnswers(quarter, week, day);
+ if (answerList.size() % Constants.TWO == Constants.ZERO) {
+ int i = (int) (((double) schedule / (answerList.size() / 2)) * 100);
+ userStudy.setAnswer(i);
+ }
}
}
} else if (Constants.FIVE.equals(type)) {
- // 音图相配
- List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
- int item = pairList.size();
- int i = (int) ((double) (schedule / item)) * 100;
- if (i > userStudy.getPair()) {
- userStudy.setPair(100 - i);
+ if (userStudy.getPair() != 100) {
+ if (1 == exitLearn.getSchedule()) {
+ userStudy.setPair(Constants.BURDEN_ONE);
+ } else {
+ // 音图相配
+ List<TStudyPair> pairList = studyPairService.pictureMateVoice(quarter, week, day);
+ if (!pairList.isEmpty()) {
+ int item = pairList.size();
+ int i = (int) (((double) schedule / item) * 100);
+ userStudy.setPair(i);
+ }
+ }
}
}
}
@@ -951,6 +1343,31 @@
userStudy.setMonthStudy(userStudy.getMonthStudy() + exitLearn.getStudyTime());
userStudyService.updateById(userStudy);
return R.ok(subjectRecordService.exitLearning(exitLearn, userid));
+ }
+
+ /**
+ * 退出游戏/故事学习
+ */
+ @GetMapping("/exitGameOrStory")
+ @ApiOperation(value = "退出游戏/故事学习", tags = {"学习端-题目"})
+ public R<Boolean> exitGameOrStory(@RequestParam("studyTime") Integer studyTime) {
+ LoginUserParent loginStudy = tokenService.getLoginUserStudy();
+ if (null == loginStudy) {
+ return R.tokenError("登录失效！");
+ }
+ Integer userid = loginStudy.getUserid();
+ // 判断当前week和day是否已完成学习
+ TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userid)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = createUserStudy(userid);
+ }
+ // 学习时长更新
+ userStudy.setTotalStudy(userStudy.getTotalStudy() + studyTime);
+ userStudy.setTodayStudy(userStudy.getTodayStudy() + studyTime);
+ userStudy.setWeekStudy(userStudy.getWeekStudy() + studyTime);
+ userStudy.setMonthStudy(userStudy.getMonthStudy() + studyTime);
+ return R.ok(userStudyService.updateById(userStudy));
}
/**
@@ -981,7 +1398,7 @@
}
}
}
- return R.ok(studyService.listenSelectPicture(week, day, studyListens));
+ return R.ok(studyService.listenSelectPicture(week, day, studyListens, tokenService.getLoginUserStudy().getUserid()));
}
/**
@@ -1012,7 +1429,7 @@
}
}
}
- return R.ok(studyService.pictureSelectVoice(week, day, lookList));
+ return studyService.pictureSelectVoice(week, day, lookList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1043,7 +1460,7 @@
}
}
}
- return R.ok(studyService.induceExclude(week, day, inductionList));
+ return studyService.induceExclude(week, day, inductionList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1074,7 +1491,7 @@
}
}
}
- return R.ok(studyService.questionsAndAnswers(week, day, answerList));
+ return studyService.questionsAndAnswers(week, day, answerList, tokenService.getLoginUserStudy().getUserid());
}
/**
@@ -1105,8 +1522,50 @@
}
}
}
- return R.ok(studyService.pictureMateVoice(week, day, pairList));
+ return studyService.pictureMateVoice(week, day, pairList, tokenService.getLoginUserStudy().getUserid());
}
+
+ /**
+ * 2.0新增-记录答题状态
+ */
+ @PostMapping("/answerQuestion")
+ @ApiOperation(value = "2.0新增-记录答题状态", tags = {"学习端-听-自主学习"})
+ public R answerQuestion(@RequestBody @Validated AnswerQuestionDTO answerQuestionDTO) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ 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 = {"学习端-听-自主学习"})
+ public R restart(@RequestBody RestartDTO restartDTO) {
+ LoginUserParent userStudy = tokenService.getLoginUserStudy();
+ if (null == userStudy) {
+ return R.tokenError("登录失效！");
+ }
+ List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery()
+ .eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
+ .eq(TSubjectRecordDetail::getWeek, restartDTO.getWeek())
+ .eq(TSubjectRecordDetail::getDay, restartDTO.getDay())
+ .eq(TSubjectRecordDetail::getType, restartDTO.getType())
+ .list();
+ for (TSubjectRecordDetail tSubjectRecordDetail : list) {
+ tSubjectRecordDetail.setStatus(1);
+ tSubjectRecordDetail.setUserId(null);
+ }
+ subjectRecordDetailService.updateBatchById(list);
+ return R.ok();
+ }
+
/**
* 学习完成，生成学习记录，积分明细记录
@@ -1123,7 +1582,18 @@
// 登录用户id
Integer userId = userStudy.getUserid();
// 判断是否已完成该题组
- boolean update = true;
+ boolean update;
+ // 清除中途退出记录
+ TSubjectRecord subjectRecord = subjectRecordService.lambdaQuery()
+ .eq(TSubjectRecord::getUserId, userId)
+ .eq(TSubjectRecord::getWeek, completeStudy.getWeek())
+ .eq(TSubjectRecord::getDay, completeStudy.getDay())
+ .eq(TSubjectRecord::getType, completeStudy.getType())
+ .eq(TSubjectRecord::getDisabled, 0)
+ .one();
+ if (null != subjectRecord) {
+ subjectRecordService.removeById(subjectRecord);
+ }
List<String> studyIds = Arrays.stream(completeStudy.getStudyIds().split(","))
.collect(Collectors.toList());
Integer type = completeStudy.getType();
@@ -1198,6 +1668,23 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
+ .eq(TSubjectRecordDetail::getWeek, week).ne(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+"%");
+ }
+ }
+ }
Integer[] array = {0, 1, 2};
if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) {
throw new GlobalException("请选择符合规则的游戏难度！");
@@ -1244,6 +1731,23 @@
if (null == userStudy) {
return R.tokenError("登录失效！");
}
+ List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
+ .eq(TSubjectRecordDetail::getWeek, week).ne(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+"%");
+ }
+ }
+ }
TGame game = gameService.gameHearing(quarter, week);
if (null == game) {
throw new GlobalException("当前季度该周目暂无配置游戏数据！");
@@ -1282,7 +1786,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();
// 生成随机索引并获取数据
@@ -1335,7 +1839,8 @@
* 例如:游戏配置的积分是100,他的正确率是50%那么拿50分,下次他再玩这个游戏 正确率是60% 那么他该获得60分 但是上次已经拿了50 所以这次就只给他加10积分
*/
Integer userid = loginUserStudy.getUserid();
- TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId()).eq(TGame::getDisabled, 0).one();
+ TGame game = gameService.lambdaQuery().eq(TGame::getId, completeStudy.getGameId())
+ .eq(TGame::getDisabled, 0).one();
if (null == game) {
throw new GlobalException("游戏信息异常！");
}
@@ -1348,18 +1853,24 @@
.eq(TIntegralRecord::getGameDifficulty, difficulty).list();
// 本次游戏总共能获取的积分数量
Integer integral;
+ Integer item = null;
if (completeStudy.getGameName().equals(Constants.HEARING)) {
// 本次游戏总积分
integral = Integer.parseInt(game.getIntegral().split(",")[difficulty]);
+ item = completeStudy.getDifficulty();
} else if (completeStudy.getGameName().equals(Constants.MEMORY)) {
integralRecordList = integralRecordService.lambdaQuery()
.eq(TIntegralRecord::getUserId, userid)
.eq(TIntegralRecord::getGameId, game.getId())
.eq(TIntegralRecord::getDisabled, 0)
- .eq(TIntegralRecord::getGameDifficulty, null).list();
+ .last("and gameDifficulty is null").list();
integral = game.getAnswerIntegral();
} else {
throw new GlobalException("该次游戏积分计算异常！");
+ }
+ Integer accuracy = completeStudy.getAccuracy();
+ if (accuracy >= 100) {
+ accuracy = 100;
}
int gameAvailableIntegral = (int) (integral * ((double) completeStudy.getAccuracy() / 100));
Integer availableIntegral = gameService.countIntegral(userid, game, completeStudy, gameAvailableIntegral, integralRecordList);
@@ -1368,7 +1879,7 @@
// 可获得积分不为null时，才添加积分明细记录
if (null != availableIntegral && !Constants.ZERO.equals(availableIntegral)) {
add = add && integralRecordService.add(String.valueOf(availableIntegral),
- Constants.COMPLETE_GAME, completeStudy.getGameId(), null, difficulty, null);
+ Constants.COMPLETE_GAME, completeStudy.getGameId(), null, item, null);
// 用户账户添加积分
TUser user = userService.getById(userid);
user.setIntegral(user.getIntegral() + availableIntegral);
@@ -1548,6 +2059,9 @@
if (null == accuracy) {
throw new GlobalException("自主故事-看图配音正确率异常！");
}
+ if (accuracy >= 100) {
+ accuracy = 100;
+ }
// 看图配音模式，也需要根据游戏正确率计算积分
double d = (double) accuracy / 100;
int integral = (int) (storyListen.getLookIntegral() * d);
@@ -1619,8 +2133,12 @@
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
.eq(TUserStudy::getDisabled, 0).one();
// 总时长还需计算上游戏测试成绩时长
- List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
- .eq(TGameRecord::getDisabled, 0).list();
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
if (null != studyRecord) {
// 学习时长格式转换
Integer todayStudy = studyRecord.getTodayStudy();
@@ -1632,7 +2150,10 @@
// 游戏总时长
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
- studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
+ for (TGameRecord tGameRecord : gameRecordList) {
+ tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
+ }
// 剩余周目
List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
.eq(TStudy::getType, Constants.ONE)
@@ -1655,6 +2176,44 @@
// 学习记录
TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ // 总时长还需计算上游戏测试成绩时长
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getUserId, userId)
+ .eq(TGameRecord::getDisabled, 0)
+ .orderByDesc(TGameRecord::getCreateTime)
+ .list();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ if (null != studyRecord) {
+ // 学习时长格式转换
+ Integer todayStudy = studyRecord.getTodayStudy();
+ studyRecord.setTodayStudy(Math.round((float) todayStudy / 3600));
+ Integer weekStudy = studyRecord.getWeekStudy();
+ studyRecord.setWeekStudy(Math.round((float) weekStudy / 3600));
+ Integer monthStudy = studyRecord.getMonthStudy();
+ studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
+ // 游戏总时长
+ int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
+ for (TGameRecord tGameRecord : gameRecordList) {
+ tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
+ }
+ Integer totalStudy = studyRecord.getTotalStudy();
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
+ // 剩余周目
+ List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ int size = studyService.residueWeek(studyRecord, studyList);
+ studyRecord.setSurplus(size);
+ }
+ return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ }
+
+ @PostMapping("/recordManagement/{id}")
+ @ApiOperation(value = "游戏测试成绩", tags = {"管理后台-查看用户详情"})
+ public R<StudyRecordResultVO> recordManagement(@PathVariable("id") Integer id) {
+ // 学习记录
+ TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, id)
.eq(TUserStudy::getDisabled, 0).one();
// 查询剩余周目
if (studyRecord != null) {
@@ -1679,17 +2238,21 @@
Integer monthStudy = studyRecord.getMonthStudy();
studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
// 总时长还需计算上游戏测试成绩时长
- List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, id)
.eq(TGameRecord::getDisabled, 0).list();
int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
Integer totalStudy = studyRecord.getTotalStudy();
- studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
- return R.ok(new StudyRecordResultVO(studyRecord, gameRecordList));
+ studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
+ StudyRecordResultVO studyRecordResultVO = new StudyRecordResultVO(studyRecord, gameRecordList);
+ return R.ok(studyRecordResultVO);
}
@GetMapping("/getIntegral")
@ApiOperation(value = "获取剩余积分", tags = {"家长端-获取剩余积分"})
public R<Integer> getIntegral() {
+ if (tokenService.getLoginUser1() == null) {
+ return R.tokenError("登录失效");
+ }
Integer userId = tokenService.getLoginUser1().getUserid();
return R.ok(userService.getById(userId).getIntegral());
}
@@ -1734,12 +2297,17 @@
public R<IPage<TIntegralRecord>> integralDetailParent(String time,
@RequestParam("pageNum") Integer pageNum,
@RequestParam("pageSize") Integer pageSize) {
- System.err.println("页码" + pageNum);
- System.err.println("页数" + pageSize);
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- return R.ok(integralRecordService.integralDetail(new Page<>(pageNum, pageSize), tokenService.getLoginUser1().getUserid(), time));
+ IPage<TIntegralRecord> page = integralRecordService.integralDetail(new Page<>(pageNum, pageSize),
+ tokenService.getLoginUser1().getUserid(), time);
+ for (TIntegralRecord record : page.getRecords()) {
+ if (!record.getIntegral().startsWith("-")) {
+ record.setIntegral("+" + record.getIntegral());
+ }
+ }
+ return R.ok(page);
}
/**
--
Gitblit v1.7.1