From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 479 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 417 insertions(+), 62 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 e5bbfb6..26c0859 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -21,11 +21,13 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import kotlin.random.Random;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -82,6 +84,70 @@
@Resource
private ITUserPresentRecordService userPresentRecordService;
+ @PostMapping("/testAddData")
+ @ApiOperation(value = "测试分片", tags = {"测试分片"})
+ public R<Object> testAddData() {
+ TIntegralRecord tIntegralRecord = new TIntegralRecord();
+ tIntegralRecord.setIntegral("1");
+ tIntegralRecord.setMethod("1");
+ tIntegralRecord.setUserId(23);
+ tIntegralRecord.setGameId(1);
+ tIntegralRecord.setGameDifficulty(1);
+ tIntegralRecord.setStoryId(1);
+ tIntegralRecord.setStoryType(1);
+ integralRecordService.save(tIntegralRecord);
+ TGameRecord tGameRecord = new TGameRecord();
+ tGameRecord.setUserId(33);
+ tGameRecord.setAccuracy(0);
+ tGameRecord.setGameName("");
+ tGameRecord.setUseTime(0);
+ tGameRecord.setUseTime1("");
+ tGameRecord.setGameId(0);
+ tGameRecord.setGameDifficulty(0);
+ tGameRecord.setTime("");
+ tGameRecord.setDisabled(false);
+ tGameRecord.setCreateBy("");
+ tGameRecord.setCreateTime(new Date());
+ tGameRecord.setUpdateBy("");
+ tGameRecord.setUpdateTime(new Date());
+ gameRecordService.save(tGameRecord);
+ TSubjectRecord tSubjectRecord = new TSubjectRecord();
+ tSubjectRecord.setUserId(22);
+ tSubjectRecord.setWeek(0);
+ tSubjectRecord.setDay(0);
+ tSubjectRecord.setBeforeSubject("");
+ tSubjectRecord.setType(0);
+ tSubjectRecord.setCompleteSubject("");
+ tSubjectRecord.setAnswerNumber(0);
+ tSubjectRecord.setCorrectNumber(0);
+ tSubjectRecord.setDisabled(false);
+ tSubjectRecord.setCreateBy("");
+ tSubjectRecord.setCreateTime(new Date());
+ tSubjectRecord.setUpdateBy("");
+ tSubjectRecord.setUpdateTime(new Date());
+ subjectRecordService.save(tSubjectRecord);
+ TUserPresentRecord tUserPresentRecord = new TUserPresentRecord();
+ tUserPresentRecord.setUserId(44);
+ tUserPresentRecord.setPresentTime(new Date());
+ tUserPresentRecord.setIsDelete(0);
+ userPresentRecordService.save(tUserPresentRecord);
+
+ TUserStudyRecord tUserStudyRecord = new TUserStudyRecord();
+ tUserStudyRecord.setUserId(17);
+ tUserStudyRecord.setQuarter(0);
+ tUserStudyRecord.setWeek(0);
+ tUserStudyRecord.setDay(0);
+ tUserStudyRecord.setObtainedIntegral(0);
+ tUserStudyRecord.setType(0);
+ tUserStudyRecord.setStudyType(0);
+ tUserStudyRecord.setStoryId(0);
+ studyRecordService.save(tUserStudyRecord);
+
+ return R.ok();
+ }
+
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
public R<PageInfo<TStory>> storyList(@RequestBody ChoiceStory query) {
@@ -89,6 +155,22 @@
QueryWrapper<TStory> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
+ }
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ .eq(TCategory::getType,1)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
+ List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 2)
+ .eq(TCategory::getType,2)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
}
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
@@ -102,21 +184,30 @@
switch (query.getStoryType()) {
case 2:
List<TStory> list = storyService.list(wrapper);
- List<TStory> tSubjects = new ArrayList<>(list);
- res.setRecords(tSubjects);
- res.setTotal(tSubjects.size());
+ for (TStory tSubject : list) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&& second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
+ res.setRecords(list);
+ res.setTotal(list.size());
return R.ok(res);
case 1:
// 查询出error字段不为空的数据
wrapper.isNotNull("error");
List<TStory> list1 = storyService.list(wrapper);
for (TStory tStory : list1) {
- if (tStory.getError()!=null && (!tStory.equals(""))){
- tStories.add(tStory);
+ TCategory first = categoryService.getById(tStory.getFirstCategory());
+ TCategory second = categoryService.getById(tStory.getSecondCategory());
+ if (first!=null&& second!=null){
+ tStory.setCategoryName(first.getName()+"-"+second.getName());
}
}
- res.setRecords(tStories);
- res.setTotal(tStories.size());
+ res.setRecords(list1);
+ res.setTotal(list1.size());
return R.ok(res);
}
@@ -134,6 +225,22 @@
if (StringUtils.hasLength(query.getName())) {
wrapper.like("name", query.getName());
}
+ if (StringUtils.hasLength(query.getCategoryName())){
+ // 查询分类id包含的
+ List<Integer> collect = categoryService.lambdaQuery().eq(TCategory::getState, 1)
+ .eq(TCategory::getType,1)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getId).collect(Collectors.toList());// 查询分类id包含的
+ List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1)
+ .eq(TCategory::getType,2)
+ .like(TCategory::getName, query.getCategoryName()).list()
+ .stream().map(TCategory::getParentId).collect(Collectors.toList());
+ collect.addAll(collect2);
+ if (collect.isEmpty()){
+ collect.add(-1);
+ }
+ wrapper.in("firstCategory", collect);
+ }
if (StringUtils.hasLength(query.getEnglish())) {
wrapper.like("english", query.getEnglish());
}
@@ -144,6 +251,15 @@
switch (query.getStudyType()) {
case 1:
List<TSubject> list = subjectService.list(wrapper);
+ for (TSubject tSubject : list) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list);
res.setTotal(list.size());
return R.ok(res);
@@ -153,6 +269,13 @@
List<TSubject> list1 = subjectService.list(wrapper);
List<TSubject> tSubjects = new ArrayList<>();
for (TSubject tSubject : list1) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects.add(tSubject);
}
@@ -162,6 +285,14 @@
return R.ok(res);
case 3:
List<TSubject> list2 = subjectService.list(wrapper);
+ for (TSubject tSubject : list2) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list2);
res.setTotal(list2.size());
return R.ok(res);
@@ -171,6 +302,12 @@
List<TSubject> list3 = subjectService.list(wrapper);
List<TSubject> tSubjects3 = new ArrayList<>();
for (TSubject tSubject : list3) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
if (!tSubject.getError().isEmpty()) {
tSubjects3.add(tSubject);
}
@@ -180,6 +317,14 @@
return R.ok(res);
case 5:
List<TSubject> list4 = subjectService.list(wrapper);
+ for (TSubject tSubject : list4) {
+ TCategory first = categoryService.getById(tSubject.getFirstCategory());
+
+ TCategory second = categoryService.getById(tSubject.getSecondCategory());
+ if (first!=null&&second!=null){
+ tSubject.setCategoryName(first.getName()+"-"+second.getName());
+ }
+ }
res.setRecords(list4);
res.setTotal(list4.size());
return R.ok(res);
@@ -215,6 +360,21 @@
.eq("studyId", one.getId())
.eq("week", week));
if (studyId != null) {
+ // 判断当前周目配置的题目数量
+ List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
+ // 判断周目下题目是否足够
+ if (newSubjectId.size() < game.getCount()) {
+ return R.fail("超级听力：当前周目下day1 - day5题目不足！");
+ }
+ if (newSubjectId.size() < game.getAnswerCount()) {
+ return R.fail("超级记忆：当前周目下day1 - day5题目不足！");
+ }
studyId.setWeek(dto.getWeek());
studyId.setStudyId(one.getId());
studyId.setCount(game.getCount());
@@ -227,6 +387,21 @@
studyId.setAnswerRate(game.getAnswerRate());
gameService.updateById(studyId);
} else {
+ // 判断当前周目配置的题目数量
+ List<String> subjectId = getSubjectId(week);
+ List<String> newSubjectId = subjectId.stream().map(data -> {
+ if (data.startsWith(Constants.REDUCE)) {
+ data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
+ }
+ return data;
+ }).distinct().collect(Collectors.toList());
+ // 判断周目下题目是否足够
+ if (newSubjectId.size() < game.getCount()) {
+ return R.fail("超级听力：当前周目下day1 - day5题目不足！");
+ }
+ if (newSubjectId.size() < game.getAnswerCount()) {
+ return R.fail("超级记忆：当前周目下day1 - day5题目不足！");
+ }
TGame tGame = new TGame();
tGame.setWeek(dto.getWeek());
tGame.setAnswerRate(game.getAnswerRate());
@@ -387,6 +562,21 @@
tStudy.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(tStudy);
}
+ // 每次添加周目后需要根据季度来重新排序周目
+ if (dto.getType() == 1){
+ List<TStudy> list1 = studyService.lambdaQuery()
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getQuarter)
+ .orderByAsc(TStudy::getWeek)
+ .list();
+ int i = 1;
+ for (TStudy tStudy : list1) {
+ tStudy.setWeek(i);
+ i++;
+ }
+ studyService.updateBatchById(list1);
+ }
+
return R.ok();
}
@@ -459,7 +649,8 @@
res.setWeeks(type);
List<TStudy> list8 = studyService.list(new QueryWrapper<TStudy>()
.eq("type", dto.getType())
- .eq("week", dto.getWeek()));
+ .eq("week", dto.getWeek())
+ .orderByAsc("quarter"));
if (!list8.isEmpty()) {
res.setQuarter(list8.get(0).getQuarter());
res.setTitle(list8.get(0).getTitle());
@@ -704,6 +895,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 周目
@@ -738,6 +945,28 @@
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);
+ }
}
return R.ok(studyRecord);
}
@@ -860,20 +1089,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);
}
@@ -887,7 +1112,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();
@@ -897,58 +1133,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);
+ }
+ }
}
}
}
@@ -959,6 +1217,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));
}
/**
@@ -1131,7 +1414,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();
@@ -1290,7 +1584,7 @@
private List<String> getData(TGame game, List<String> newSubjectId, int num) {
List<String> subjectData = new ArrayList<>();
- Random random = new Random();
+ java.util.Random random = new java.util.Random();
// 获取列表大小
int dataSize = newSubjectId.size();
// 生成随机索引并获取数据
@@ -1371,6 +1665,10 @@
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);
@@ -1559,6 +1857,9 @@
if (null == accuracy) {
throw new GlobalException("自主故事-看图配音正确率异常！");
}
+ if (accuracy >= 100) {
+ accuracy = 100;
+ }
// 看图配音模式，也需要根据游戏正确率计算积分
double d = (double) accuracy / 100;
int integral = (int) (storyListen.getLookIntegral() * d);
@@ -1630,8 +1931,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();
@@ -1643,7 +1948,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)
@@ -1666,6 +1974,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) {
@@ -1690,17 +2036,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());
}
@@ -1745,12 +2095,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