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/service/impl/TStudyServiceImpl.java | 663 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 604 insertions(+), 59 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index 1f7d72f..49ce7df 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.exception.GlobalException;
-import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.study.domain.*;
-import com.ruoyi.study.dto.CompleteGameDTO;
import com.ruoyi.study.dto.StudyWeekDTO;
import com.ruoyi.study.mapper.TStudyMapper;
import com.ruoyi.study.service.*;
@@ -56,7 +54,7 @@
}
@Override
- public List<StudyWeekDTO> weekList(Integer type, Integer quarter) {
+ public List<StudyWeekDTO> weekList(Integer type, Integer quarter, Integer userId) {
List<StudyWeekDTO> result = new ArrayList<>();
// 根据季度和type查询学习配置
List<TStudy> study = lambdaQuery().eq(TStudy::getQuarter, quarter).eq(TStudy::getType, type)
@@ -67,44 +65,76 @@
Integer id = item.getId();
// 计算总积分
int total = 0;
+ List<Integer> dayList = new ArrayList<>();
// 有问有答
- List<TStudyAnswer> answerList = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getStudyId, id)
+ List<TStudyAnswer> answerList = studyAnswerService.lambdaQuery()
+ .eq(TStudyAnswer::getStudyId, id)
+ .eq(TStudyAnswer::getWeek, week)
.eq(TStudyAnswer::getDisabled, 0).list();
- Optional<TStudyAnswer> answerOptional = answerList.stream().findAny();
- if (answerOptional.isPresent()) {
- total += answerOptional.get().getIntegral();
+ for (TStudyAnswer data : answerList) {
+ Integer day = data.getDay();
+ if (!dayList.contains(day)) {
+ total += data.getIntegral();
+ dayList.add(day);
+ }
}
+ dayList.clear();
// 归纳判断
- List<TStudyInduction> inductionList = studyInductionService.lambdaQuery().eq(TStudyInduction::getStudyId, id)
+ List<TStudyInduction> inductionList = studyInductionService.lambdaQuery()
+ .eq(TStudyInduction::getStudyId, id)
+ .eq(TStudyInduction::getWeek, week)
.eq(TStudyInduction::getDisabled, 0).list();
- Optional<TStudyInduction> inductionOptional = inductionList.stream().findAny();
- if (inductionOptional.isPresent()) {
- total += inductionOptional.get().getIntegral();
+ for (TStudyInduction data : inductionList) {
+ Integer day = data.getDay();
+ if (!dayList.contains(day)) {
+ total += data.getIntegral();
+ dayList.add(day);
+ }
}
+ dayList.clear();
// 看图选音
- List<TStudyLook> lookList = studyLookService.lambdaQuery().eq(TStudyLook::getStudyId, id)
+ List<TStudyLook> lookList = studyLookService.lambdaQuery()
+ .eq(TStudyLook::getStudyId, id)
+ .eq(TStudyLook::getWeek, week)
.eq(TStudyLook::getDisabled, 0).list();
- Optional<TStudyLook> lookOptional = lookList.stream().findAny();
- if (lookOptional.isPresent()) {
- total += lookOptional.get().getIntegral();
+ for (TStudyLook data : lookList) {
+ Integer day = data.getDay();
+ if (!dayList.contains(day)) {
+ total += data.getIntegral();
+ dayList.add(day);
+ }
}
+ dayList.clear();
// 听音选图
- List<TStudyListen> listenList = studyListenService.lambdaQuery().eq(TStudyListen::getStudyId, id)
+ List<TStudyListen> listenList = studyListenService.lambdaQuery()
+ .eq(TStudyListen::getStudyId, id)
+ .eq(TStudyListen::getWeek, week)
.eq(TStudyListen::getDisabled, 0).list();
- Optional<TStudyListen> listenOptional = listenList.stream().findAny();
- if (listenOptional.isPresent()) {
- total += listenOptional.get().getIntegral();
+ for (TStudyListen data : listenList) {
+ Integer day = data.getDay();
+ if (!dayList.contains(day)) {
+ total += data.getIntegral();
+ dayList.add(day);
+ }
}
+ dayList.clear();
// 音图相配
- List<TStudyPair> pairList = studyPairService.lambdaQuery().eq(TStudyPair::getStudyId, id)
+ List<TStudyPair> pairList = studyPairService.lambdaQuery()
+ .eq(TStudyPair::getStudyId, id)
+ .eq(TStudyPair::getWeek, week)
.eq(TStudyPair::getDisabled, 0).list();
- Optional<TStudyPair> pairOptional = pairList.stream().findAny();
- if (pairOptional.isPresent()) {
- total += pairOptional.get().getIntegral();
+ for (TStudyPair data : pairList) {
+ Integer day = data.getDay();
+ if (!dayList.contains(day)) {
+ total += data.getIntegral();
+ dayList.add(day);
+ }
}
+ dayList.clear();
// 自主游戏
List<TGame> gameList = gameService.lambdaQuery().eq(TGame::getStudyId, id)
- .eq(TGame::getDisabled, 0).list();
+ .eq(TGame::getDisabled, 0)
+ .eq(TGame::getWeek, week).list();
// 自主游戏-超级听力
List<String> gameIntegral = gameList.stream().map(TGame::getIntegral).collect(Collectors.toList());
for (String s : gameIntegral) {
@@ -119,20 +149,251 @@
}
}
// 自主故事
- List<TStoryListen> storyListenList = storyListenService.lambdaQuery().eq(TStoryListen::getStudyId, id)
+ List<TStoryListen> storyListenList = storyListenService.lambdaQuery()
+ .eq(TStoryListen::getStudyId, id)
+ .eq(TStoryListen::getWeek, week)
.eq(TStoryListen::getDisabled, 0).list();
// 自主故事 - 框架记忆
total += storyListenList.stream().map(TStoryListen::getIntegral).mapToInt(Integer::intValue).sum();
// 自主故事 - 看图配音
total += storyListenList.stream().map(TStoryListen::getLookIntegral).mapToInt(Integer::intValue).sum();
- result.add(new StudyWeekDTO(week, type, quarter, title, total));
+ // 判断周目是否可以进入学习
+ Boolean canStudy = checkWeekCanStudy(userId, item, week);
+ result.add(new StudyWeekDTO(week, type, quarter, title, total, canStudy));
}
return result;
}
@Override
- public TUserStudy studySchedule(String userId) {
- return userStudyService.studySchedule(userId);
+ public TUserStudy studySchedule(TUserStudy studyRecord, Integer week) {
+ // 剩余周目
+ List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ // 已学习到的周目
+ Integer studyWeek = studyRecord.getWeek();
+ // 学习到的季度
+ Integer studyQuarter = 1;
+ // 当前所点击进入的周目所属季度
+ Integer currentQuarter = 1;
+ // 根据季度分组封装
+ Map<Integer, List<TStudy>> integerListMap = getIntegerListMap(studyList);
+ for (Map.Entry<Integer, List<TStudy>> map : integerListMap.entrySet()) {
+ List<TStudy> list = map.getValue();
+ for (TStudy study : list) {
+ Integer itemWeek = study.getWeek();
+ if (studyWeek.equals(itemWeek)) {
+ studyQuarter = map.getKey();
+ break;
+ }
+ }
+ for (TStudy study : list) {
+ Integer itemWeek = study.getWeek();
+ if (week.equals(itemWeek)) {
+ currentQuarter = map.getKey();
+ break;
+ }
+ }
+ }
+ // 已学习季度 大于当前周目所属季度，所有学习均已完成
+ if (studyQuarter > currentQuarter) {
+ studyRecord.setWeek(week);
+ studyRecord.setDay(Constants.SIX);
+ studyRecord.setListen(Constants.ONE_HUNDRED);
+ studyRecord.setLook(Constants.ONE_HUNDRED);
+ studyRecord.setInduction(Constants.ONE_HUNDRED);
+ studyRecord.setAnswer(Constants.ONE_HUNDRED);
+ studyRecord.setPair(Constants.ONE_HUNDRED);
+ studyRecord.setGameDifficulty(Constants.TWO);
+ studyRecord.setComputeSchedule(Constants.ONE_HUNDRED);
+ } else if (studyQuarter < currentQuarter) {
+ studyRecord.setWeek(week);
+ studyRecord.setDay(Constants.ONE);
+ studyRecord.setListen(Constants.BURDEN_ONE);
+ studyRecord.setLook(Constants.BURDEN_ONE);
+ studyRecord.setInduction(Constants.BURDEN_ONE);
+ studyRecord.setAnswer(Constants.BURDEN_ONE);
+ studyRecord.setPair(Constants.BURDEN_ONE);
+ studyRecord.setGameDifficulty(null);
+ studyRecord.setComputeSchedule(Constants.ZERO);
+ } else {
+ List<TStudy> tStudies = integerListMap.get(studyQuarter);
+ List<Integer> weekList = tStudies.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ int i = weekList.indexOf(studyWeek);
+ int i1 = weekList.indexOf(week);
+ if (i > i1) {
+ studyRecord.setWeek(week);
+ studyRecord.setDay(Constants.SIX);
+ studyRecord.setListen(Constants.ONE_HUNDRED);
+ studyRecord.setLook(Constants.ONE_HUNDRED);
+ studyRecord.setInduction(Constants.ONE_HUNDRED);
+ studyRecord.setAnswer(Constants.ONE_HUNDRED);
+ studyRecord.setPair(Constants.ONE_HUNDRED);
+ studyRecord.setGameDifficulty(Constants.TWO);
+ studyRecord.setComputeSchedule(Constants.ONE_HUNDRED);
+ } else if (i < i1) {
+ studyRecord.setWeek(week);
+ studyRecord.setDay(Constants.ONE);
+ studyRecord.setListen(Constants.BURDEN_ONE);
+ studyRecord.setLook(Constants.BURDEN_ONE);
+ studyRecord.setInduction(Constants.BURDEN_ONE);
+ studyRecord.setAnswer(Constants.BURDEN_ONE);
+ studyRecord.setPair(Constants.BURDEN_ONE);
+ studyRecord.setGameDifficulty(null);
+ studyRecord.setComputeSchedule(Constants.ZERO);
+ }
+ }
+ return studyRecord;
+ }
+
+ /**
+ * @param userId 用户id
+ * @param week 该季度下的周目
+ * @return 当前周目是否学习
+ */
+ private Boolean checkWeekCanStudyNew(Integer userId, TStudy study, Integer week) {
+ // 剩余周目
+ List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ TUserStudy userStudy = userStudyService.lambdaQuery()
+ .eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = new TUserStudy();
+ userStudy.setUserId(userId);
+ // 学习周目
+ TStudy tStudy = this.lambdaQuery().eq(TStudy::getQuarter, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).last("limit 1").one();
+ userStudy.setWeek(tStudy.getWeek());
+ userStudy.setDay(Constants.ONE);
+ userStudy.setTotalStudy(Constants.ZERO);
+ userStudy.setTodayStudy(Constants.ZERO);
+ userStudy.setWeekStudy(Constants.ZERO);
+ userStudy.setMonthStudy(Constants.ZERO);
+ userStudy.setListen(Constants.BURDEN_ONE);
+ userStudy.setLook(Constants.BURDEN_ONE);
+ userStudy.setInduction(Constants.BURDEN_ONE);
+ userStudy.setAnswer(Constants.BURDEN_ONE);
+ userStudy.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(userStudy);
+ }
+ // 获取当前学习周目为哪一个季度
+ TStudy studyQuarterVo = this.lambdaQuery()
+ .eq(TStudy::getWeek, userStudy.getWeek())
+ .eq(TStudy::getDisabled, 0).one();
+ // 已学习到的周目
+ Integer studyWeek = userStudy.getWeek();
+ // 学习到的季度
+ Integer studyQuarter = studyQuarterVo.getQuarter();
+ // 当前所点击进入的周目所属季度
+ Integer currentQuarter = 1;
+ // 根据季度分组封装
+ Map<Integer, List<TStudy>> integerListMap = getIntegerListMap(studyList);
+ for (Map.Entry<Integer, List<TStudy>> map : integerListMap.entrySet()) {
+ List<TStudy> list = map.getValue();
+// for (TStudy data : list) {
+// Integer itemWeek = data.getWeek();
+// if (studyWeek.equals(itemWeek)) {
+// studyQuarter = map.getKey();
+// break;
+// }
+// }
+ for (TStudy data : list) {
+ Integer itemWeek = data.getWeek();
+ if (week.equals(itemWeek)) {
+ currentQuarter = map.getKey();
+ break;
+ }
+ }
+ }
+ // 已学习季度 大于当前周目所属季度，所有学习均已完成
+ if (studyQuarter > currentQuarter) {
+ return Boolean.TRUE;
+ } else if (studyQuarter < currentQuarter) {
+ return Boolean.FALSE;
+ } else {
+ List<TStudy> tStudies = integerListMap.get(studyQuarter);
+ List<Integer> weekList = tStudies.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ int i = weekList.indexOf(studyWeek);
+ int i1 = weekList.indexOf(week);
+ if (i >= i1) {
+ return Boolean.TRUE;
+ } else {
+ return Boolean.FALSE;
+ }
+ }
+ }
+
+ /**
+ * @param userId 用户id
+ * @return 当前周目是否学习
+ */
+ private Boolean checkWeekCanStudy(Integer userId, TStudy study, Integer week) {
+ // 剩余周目
+ List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).list();
+ TUserStudy userStudy = userStudyService.lambdaQuery()
+ .eq(TUserStudy::getUserId, userId)
+ .eq(TUserStudy::getDisabled, 0).one();
+ if (null == userStudy) {
+ userStudy = new TUserStudy();
+ userStudy.setUserId(userId);
+ // 学习周目
+ TStudy tStudy = this.lambdaQuery().eq(TStudy::getQuarter, Constants.ONE)
+ .orderByAsc(TStudy::getWeek).last("limit 1").one();
+ userStudy.setWeek(tStudy.getWeek());
+ userStudy.setDay(Constants.ONE);
+ userStudy.setTotalStudy(Constants.ZERO);
+ userStudy.setTodayStudy(Constants.ZERO);
+ userStudy.setWeekStudy(Constants.ZERO);
+ userStudy.setMonthStudy(Constants.ZERO);
+ userStudy.setListen(Constants.BURDEN_ONE);
+ userStudy.setLook(Constants.BURDEN_ONE);
+ userStudy.setInduction(Constants.BURDEN_ONE);
+ userStudy.setAnswer(Constants.BURDEN_ONE);
+ userStudy.setPair(Constants.BURDEN_ONE);
+ userStudyService.save(userStudy);
+ }
+ // 获取当前学习周目为哪一个季度
+ TStudy studyQuarterVo = this.lambdaQuery()
+ .eq(TStudy::getWeek, userStudy.getWeek())
+ .eq(TStudy::getDisabled, 0).one();
+ // 已学习到的周目
+ Integer studyWeek = userStudy.getWeek();
+ // 学习到的季度
+ Integer studyQuarter = studyQuarterVo.getQuarter();
+ // 当前所点击进入的周目所属季度
+ Integer currentQuarter = 1;
+ // 根据季度分组封装
+ Map<Integer, List<TStudy>> integerListMap = getIntegerListMap(studyList);
+ for (Map.Entry<Integer, List<TStudy>> map : integerListMap.entrySet()) {
+ List<TStudy> list = map.getValue();
+ for (TStudy data : list) {
+ Integer itemWeek = data.getWeek();
+ if (week.equals(itemWeek)) {
+ currentQuarter = map.getKey();
+ break;
+ }
+ }
+ }
+ // 已学习季度 大于当前周目所属季度，所有学习均已完成
+ if (studyQuarter > currentQuarter) {
+ return Boolean.TRUE;
+ } else if (studyQuarter < currentQuarter) {
+ return Boolean.FALSE;
+ } else {
+ List<TStudy> tStudies = integerListMap.get(studyQuarter);
+ List<Integer> weekList = tStudies.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ int i = weekList.indexOf(studyWeek);
+ int i1 = weekList.indexOf(week);
+ if (i >= i1) {
+ return Boolean.TRUE;
+ } else {
+ return Boolean.FALSE;
+ }
+ }
}
@Override
@@ -209,14 +470,18 @@
// 语音及图片
List<List<TSubject>> subjectList = new ArrayList<>();
for (TStudyLook studyLook : lookList) {
+ List<String> sortList = Arrays.stream(studyLook.getSort().split(",")).collect(Collectors.toList());
List<String> subjectIds = Arrays.stream(studyLook.getSubject().split(",")).collect(Collectors.toList());
List<TSubject> list = new ArrayList<>();
// 图片及语音集合
- for (String id : subjectIds) {
- TSubject data = subjectService.lambdaQuery().eq(TSubject::getId, id)
+ for (int i = 0; i < subjectIds.size(); i++) {
+ TSubject data = subjectService.lambdaQuery().eq(TSubject::getId, subjectIds.get(i))
.eq(TSubject::getDisabled, 0).one();
+ data.setSort(Integer.parseInt(sortList.get(i)));
list.add(data);
}
+ // 根据顺序排序
+ list.sort(Comparator.comparingInt(TSubject::getSort));
subjectList.add(list);
}
return new StudyLookResultVO(learnStudy, subjectList);
@@ -244,12 +509,35 @@
for (TStudyInduction data : inductionList) {
List<String> subjectIds = Arrays.stream(data.getSubject().split(",")).collect(Collectors.toList());
List<TSubject> subjectLists = new ArrayList<>();
- for (String id : subjectIds) {
+ // 第一组题 固定下标为0,1,2的题
+ for (int i = 0; i < Constants.THREE; i++) {
+ String id = subjectIds.get(i);
+ if (!id.startsWith("-")) {
+ subjectLists.add(subjectService.getById(id));
+ }
+ }
+ for (int i = 0; i < Constants.THREE; i++) {
+ String id = subjectIds.get(i);
if (id.startsWith("-")) {
id = id.replace("-", "");
+ subjectLists.add(subjectService.getById(id));
}
- subjectLists.add(subjectService.getById(id));
}
+ // 第二组题，固定下标为3,4的题
+ for (int i = Constants.THREE; i < Constants.FIVE; i++) {
+ String id = subjectIds.get(i);
+ if (!id.startsWith("-")) {
+ subjectLists.add(subjectService.getById(id));
+ }
+ }
+ for (int i = Constants.THREE; i < Constants.FIVE; i++) {
+ String id = subjectIds.get(i);
+ if (id.startsWith("-")) {
+ id = id.replace("-", "");
+ subjectLists.add(subjectService.getById(id));
+ }
+ }
+ subjectLists.add(subjectService.getById(subjectIds.get(subjectIds.size() - 1).replace("-", "")));
subjectList.add(subjectLists);
}
return new StudyInductionResultVO(learnStudy, subjectList);
@@ -294,22 +582,34 @@
QuestionsAnswersSubjectVO oneVO = new QuestionsAnswersSubjectVO();
TSubject one1 = subjectService.lambdaQuery().eq(TSubject::getId, subject)
.eq(TSubject::getDisabled, 0).one();
- BeanUtils.copyProperties(one1, oneVO);
+ copyProperties(one1, oneVO);
// 回答题目信息
QuestionsAnswersSubjectVO twoVO = new QuestionsAnswersSubjectVO();
TSubject two1 = subjectService.lambdaQuery().eq(TSubject::getId, answerSubject)
.eq(TSubject::getDisabled, 0).one();
- BeanUtils.copyProperties(two1, twoVO);
+ copyProperties(two1, twoVO);
// 判断第一组题目的问题题目及回答题目，哪个是答案
if (Constants.ZERO.equals(one.getIsAnswer())) {
- oneVO.setIsQuestion(0);
- twoVO.setIsQuestion(1);
- } else {
oneVO.setIsQuestion(1);
twoVO.setIsQuestion(0);
+ } else {
+ oneVO.setIsQuestion(0);
+ twoVO.setIsQuestion(1);
}
voList.add(oneVO);
voList.add(twoVO);
+ }
+
+ private void copyProperties(TSubject subject, QuestionsAnswersSubjectVO vo) {
+ vo.setId(subject.getId());
+ vo.setName(subject.getName());
+ vo.setEnglish(subject.getEnglish());
+ vo.setType(subject.getType());
+ vo.setState(subject.getState());
+ vo.setImg(subject.getImg());
+ vo.setCorrect(subject.getCorrect());
+ vo.setError(subject.getError());
+ vo.setSort(subject.getSort());
}
@Override
@@ -347,17 +647,93 @@
@Override
public int computeSchedule(TUserStudy result, Integer week) {
+ List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getWeek).list();
// 基础学习进度
- Integer listen = result.getListen();
- Integer look = result.getLook();
- Integer induction = result.getInduction();
- Integer answer = result.getAnswer();
- Integer pair = result.getPair();
Integer day = result.getDay();
+ Integer studyWeek = result.getWeek();
+ Map<Integer, List<TStudy>> studyMap = new HashMap<>(8);
+ for (TStudy study : studyList) {
+ Integer quarter = study.getQuarter();
+ List<TStudy> itemList = studyMap.get(quarter);
+ if (null == itemList) {
+ itemList = new ArrayList<>();
+ }
+ itemList.add(study);
+ studyMap.put(quarter, itemList);
+ }
+ // 学习进度所属季度
+ int studyQuarter = 1;
+ // 当前进入周目所属季度
+ int thisQuarter = 1;
+ for (Map.Entry<Integer, List<TStudy>> map : studyMap.entrySet()) {
+ Integer key = map.getKey();
+ List<TStudy> list = map.getValue();
+ List<Integer> collect = list.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ if (collect.contains(studyWeek)) {
+ studyQuarter = key;
+ }
+ if (collect.contains(week)) {
+ thisQuarter = key;
+ }
+ }
// 默认进度为 0
int defaultSchedule;
+ // 季度判断
+ if (studyQuarter > thisQuarter) {
+ defaultSchedule = 100;
+ } else if (studyQuarter < thisQuarter) {
+ defaultSchedule = 0;
+ } else {
+ List<TStudy> tStudies = studyMap.get(studyQuarter);
+ List<Integer> weekList = tStudies.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ int studyIndex = weekList.indexOf(studyWeek);
+ int weekIndex = weekList.indexOf(week);
+ if (studyIndex > weekIndex) {
+ defaultSchedule = 100;
+ } else if (studyIndex < weekIndex) {
+ defaultSchedule = 0;
+ } else {
+ // 根据day初始化学习进度
+ if (Constants.ONE.equals(day)) {
+ defaultSchedule = 0;
+ } else if (Constants.TWO.equals(day)) {
+ defaultSchedule = 20;
+ } else if (Constants.THREE.equals(day)) {
+ defaultSchedule = 40;
+ } else if (Constants.FOUR.equals(day)) {
+ defaultSchedule = 60;
+ } else if (Constants.FIVE.equals(day)) {
+ defaultSchedule = 80;
+ } else {
+ defaultSchedule = 0;
+ }
+ // 根据五种学习计算进度
+ Integer listen = result.getListen();
+ if (!Constants.BURDEN_ONE.equals(listen)) {
+ defaultSchedule += (int) (((double) listen / 100) * 4);
+ }
+ Integer look = result.getLook();
+ if (!Constants.BURDEN_ONE.equals(look)) {
+ defaultSchedule += (int) (((double) look / 100) * 4);
+ }
+ Integer induction = result.getInduction();
+ if (!Constants.BURDEN_ONE.equals(induction)) {
+ defaultSchedule += (int) (((double) induction / 100) * 4);
+ }
+ Integer answer = result.getAnswer();
+ if (!Constants.BURDEN_ONE.equals(answer)) {
+ defaultSchedule += (int) (((double) answer / 100) * 4);
+ }
+ Integer pair = result.getPair();
+ if (!Constants.BURDEN_ONE.equals(pair)) {
+ defaultSchedule += (int) (((double) pair / 100) * 4);
+ }
+ }
+ }
// week以超过当前week，进度为 100%
- if (result.getWeek() > week) {
+ /*if (itemBool) {
defaultSchedule = 100;
} else {
// 根据day初始化学习进度
@@ -374,24 +750,28 @@
} else {
defaultSchedule = 0;
}
- // 进度学习完成度计算总学习进度
- // todo 不确定是否需要累计计算 中途退出的进度
- /*if (!Constants.ZERO.equals(listen) && !Constants.BURDEN_ONE.equals(listen)) {
- defaultSchedule += 4 * (100 / listen);
+ // 根据五种学习计算进度
+ Integer listen = result.getListen();
+ if (!Constants.BURDEN_ONE.equals(listen)) {
+ defaultSchedule += (int) (((double) listen / 100) * 4);
}
- if (!Constants.ZERO.equals(look) && !Constants.BURDEN_ONE.equals(look)) {
- defaultSchedule += 4 * (100 / look);
+ Integer look = result.getLook();
+ if (!Constants.BURDEN_ONE.equals(look)) {
+ defaultSchedule += (int) (((double) look / 100) * 4);
}
- if (!Constants.ZERO.equals(induction) && !Constants.BURDEN_ONE.equals(induction)) {
- defaultSchedule += 4 * (100 / induction);
+ Integer induction = result.getInduction();
+ if (!Constants.BURDEN_ONE.equals(induction)) {
+ defaultSchedule += (int) (((double) induction / 100) * 4);
}
- if (!Constants.ZERO.equals(answer) && !Constants.BURDEN_ONE.equals(answer)) {
- defaultSchedule += 4 * (100 / answer);
+ Integer answer = result.getAnswer();
+ if (!Constants.BURDEN_ONE.equals(answer)) {
+ defaultSchedule += (int) (((double) answer / 100) * 4);
}
- if (!Constants.ZERO.equals(pair) && !Constants.BURDEN_ONE.equals(pair)) {
- defaultSchedule += 4 * (100 / pair);
- }*/
- }
+ Integer pair = result.getPair();
+ if (!Constants.BURDEN_ONE.equals(pair)) {
+ defaultSchedule += (int) (((double) pair / 100) * 4);
+ }
+ }*/
return defaultSchedule;
}
@@ -436,12 +816,177 @@
} else {
throw new GlobalException("题目信息异常！");
}
- return (int) (sum * ((double) accuracy / 100));
+ if (accuracy >= 100) {
+ return sum;
+ } else {
+ return (int) (sum * ((double) accuracy / 100));
+ }
}
@Override
- public void checkRate(TGame game, Integer userid, CompleteGameDTO completeStudy) {
+ public int residueWeek(TUserStudy studyRecord, List<TStudy> studyList) {
+ // 已学习周目
+ int residueWeek = 0;
+ // 已学习到的周目
+ Integer studyWeek = studyRecord.getWeek();
+ // 根据季度分组封装
+ Map<Integer, List<TStudy>> itemMap = getIntegerListMap(studyList);
+ // 计算已学习周目
+ boolean v = false;
+ for (Map.Entry<Integer, List<TStudy>> map : itemMap.entrySet()) {
+ List<TStudy> list = map.getValue();
+ for (int i = 0; i < list.size(); i++) {
+ TStudy item = list.get(i);
+ if (item.getWeek().equals(studyWeek)) {
+ Integer listen = studyRecord.getListen();
+ Integer answer = studyRecord.getAnswer();
+ Integer look = studyRecord.getLook();
+ Integer induction = studyRecord.getInduction();
+ Integer pair = studyRecord.getPair();
+ Integer gameDifficulty = studyRecord.getGameDifficulty();
+ // 听音选图、看图选音、音图相配、有问有答、归纳排除的进度是否 100%，并且超级听力的游戏难度是否为2
+ boolean isStudy = Constants.ONE_HUNDRED.equals(listen) && Constants.ONE_HUNDRED.equals(look) &&
+ Constants.ONE_HUNDRED.equals(induction) && Constants.ONE_HUNDRED.equals(pair) &&
+ Constants.ONE_HUNDRED.equals(answer) && Constants.TWO.equals(gameDifficulty);
+ // 并且超级听力难度2已通过
+ TStudy study = this.lambdaQuery().eq(TStudy::getWeek, studyRecord.getWeek())
+ .eq(TStudy::getDisabled, 0)
+ .one();
+ TGame game = gameService.lambdaQuery()
+ .eq(TGame::getStudyId, study.getId())
+ .eq(TGame::getDisabled, 0)
+ .eq(TGame::getWeek, study.getWeek())
+ .one();
+ if (null != game) {
+ String rate = game.getRate().split(",")[2];
+ List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery()
+ .eq(TGameRecord::getGameDifficulty, Constants.TWO)
+ .ge(TGameRecord::getAccuracy, rate)
+ .eq(TGameRecord::getUserId, studyRecord.getUserId())
+ .eq(TGameRecord::getGameId, game.getId())
+ .list();
+ if (gameRecordList.isEmpty()) {
+ isStudy = false;
+ }
+ List<TGameRecord> recordList = gameRecordService.lambdaQuery()
+ .ge(TGameRecord::getAccuracy, game.getAnswerRate())
+ .eq(TGameRecord::getUserId, studyRecord.getUserId())
+ .eq(TGameRecord::getGameId, game.getId())
+ .last("and gameDifficulty is null")
+ .list();
+ if (recordList.isEmpty()) {
+ isStudy = false;
+ }
+ }
+ if (isStudy) {
+ residueWeek++;
+ }
+ v = true;
+ break;
+ } else {
+ residueWeek++;
+ }
+ }
+ if (v) {
+ break;
+ }
+ }
+ return studyList.size() - residueWeek;
+ }
+ private Map<Integer, List<TStudy>> getIntegerListMap(List<TStudy> studyList) {
+ Map<Integer, List<TStudy>> studyMap = new HashMap<>(8);
+ for (TStudy study : studyList) {
+ Integer quarter = study.getQuarter();
+ List<TStudy> itemList = studyMap.get(quarter);
+ if (null == itemList) {
+ itemList = new ArrayList<>();
+ }
+ itemList.add(study);
+ studyMap.put(quarter, itemList);
+ }
+ // 顺序排序
+ Map<Integer, List<TStudy>> itemMap = new HashMap<>(8);
+ List<Integer> keyList = new ArrayList<>();
+ for (Map.Entry<Integer, List<TStudy>> map : studyMap.entrySet()) {
+ Integer key = map.getKey();
+ keyList.add(key);
+ }
+ Collections.sort(keyList);
+ for (Integer key : keyList) {
+ List<TStudy> itemList = studyMap.get(key);
+ itemMap.put(key, itemList);
+ }
+ return itemMap;
+ }
+
+ @Override
+ public void checkClearance(TGame game, Integer userid) {
+ String rate = game.getRate().split(",")[Constants.TWO];
+ // 获取用户游戏进度
+ List<TGameRecord> list = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userid)
+ .eq(TGameRecord::getGameId, game.getId())
+ .ge(TGameRecord::getAccuracy, rate)
+ .eq(TGameRecord::getGameDifficulty, Constants.TWO).list();
+ if (list.isEmpty()) {
+ throw new GlobalException("超级听力暂未通关！");
+ }
+ }
+
+ @Override
+ public Integer userGameDifficulty(TUserStudy studyRecord, Integer week) {
+ List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
+ .eq(TStudy::getType, 1)
+ .orderByAsc(TStudy::getWeek).list();
+ // 基础学习进度
+ Integer day = studyRecord.getDay();
+ Integer studyWeek = studyRecord.getWeek();
+ Map<Integer, List<TStudy>> studyMap = new HashMap<>(8);
+ for (TStudy study : studyList) {
+ Integer quarter = study.getQuarter();
+ List<TStudy> itemList = studyMap.get(quarter);
+ if (null == itemList) {
+ itemList = new ArrayList<>();
+ }
+ itemList.add(study);
+ studyMap.put(quarter, itemList);
+ }
+ // 学习进度所属季度
+ int studyQuarter = 1;
+ // 当前进入周目所属季度
+ int thisQuarter = 1;
+ for (Map.Entry<Integer, List<TStudy>> map : studyMap.entrySet()) {
+ Integer key = map.getKey();
+ List<TStudy> list = map.getValue();
+ List<Integer> collect = list.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ if (collect.contains(studyWeek)) {
+ studyQuarter = key;
+ }
+ if (collect.contains(week)) {
+ thisQuarter = key;
+ }
+ }
+ // 默认进度为 0
+ int defaultSchedule;
+ // 季度判断
+ if (studyQuarter > thisQuarter) {
+ defaultSchedule = 2;
+ } else if (studyQuarter < thisQuarter) {
+ defaultSchedule = 0;
+ } else {
+ List<TStudy> tStudies = studyMap.get(studyQuarter);
+ List<Integer> weekList = tStudies.stream().map(TStudy::getWeek).collect(Collectors.toList());
+ int studyIndex = weekList.indexOf(studyWeek);
+ int weekIndex = weekList.indexOf(week);
+ if (studyIndex > weekIndex) {
+ defaultSchedule = 2;
+ } else if (studyIndex < weekIndex) {
+ defaultSchedule = 0;
+ } else {
+ defaultSchedule = studyRecord.getGameDifficulty();
+ }
+ }
+ return defaultSchedule;
}
}
--
Gitblit v1.7.1