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 | 454 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 389 insertions(+), 65 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 60558ec..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
@@ -65,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) {
@@ -117,25 +149,115 @@
}
}
// 自主故事
- 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();
// 判断周目是否可以进入学习
- Boolean canStudy = checkWeekCanStudy(userId, item);
+ Boolean canStudy = checkWeekCanStudy(userId, item, week);
result.add(new StudyWeekDTO(week, type, quarter, title, total, canStudy));
}
return result;
}
+ @Override
+ 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 checkWeekCanStudy(Integer userId, TStudy study) {
- TUserStudy userStudy = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, userId)
+ 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();
@@ -156,13 +278,122 @@
userStudy.setPair(Constants.BURDEN_ONE);
userStudyService.save(userStudy);
}
- // 学习记录所属周目大于当前学习周目，判断为已学习
- return userStudy.getWeek() >= study.getWeek();
+ // 获取当前学习周目为哪一个季度
+ 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;
+ }
+ }
}
- @Override
- public TUserStudy studySchedule(String userId) {
- return userStudyService.studySchedule(userId);
+ /**
+ * @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
@@ -432,8 +663,6 @@
itemList.add(study);
studyMap.put(quarter, itemList);
}
- // 临时判断参数
- boolean itemBool = false;
// 学习进度所属季度
int studyQuarter = 1;
// 当前进入周目所属季度
@@ -465,7 +694,7 @@
defaultSchedule = 100;
} else if (studyIndex < weekIndex) {
defaultSchedule = 0;
- }else {
+ } else {
// 根据day初始化学习进度
if (Constants.ONE.equals(day)) {
defaultSchedule = 0;
@@ -587,7 +816,11 @@
} else {
throw new GlobalException("题目信息异常！");
}
- return (int) (sum * ((double) accuracy / 100));
+ if (accuracy >= 100) {
+ return sum;
+ } else {
+ return (int) (sum * ((double) accuracy / 100));
+ }
}
@Override
@@ -597,6 +830,71 @@
// 已学习到的周目
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();
@@ -619,37 +917,7 @@
List<TStudy> itemList = studyMap.get(key);
itemMap.put(key, itemList);
}
- // 计算已学习周目
- 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);
- if (isStudy) {
- residueWeek++;
- }
- v = true;
- break;
- } else {
- residueWeek++;
- }
- }
- if (v) {
- break;
- }
- }
- return studyList.size() - residueWeek;
+ return itemMap;
}
@Override
@@ -665,4 +933,60 @@
}
}
+ @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