新增迭代

无关风月

2 天以前 401510af482a05aa777db983791f8e7594edaec2

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TUserStudyServiceImpl.java

@@ -1,6 +1,5 @@
package com.ruoyi.study.service.impl;

import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.study.domain.TGame;
@@ -59,12 +58,6 @@
    }

    @Override
    public TUserStudy studySchedule(String userId) {
        LambdaQueryChainWrapper<TUserStudy> wrapper = lambdaQuery().eq(TUserStudy::getUserId, userId);
        return wrapper.eq(TUserStudy::getDisabled, 0).one();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void resettingStudyRecord(String time) {
        List<TUserStudy> list = lambdaQuery().eq(TUserStudy::getDisabled, 0).list();
@@ -102,38 +95,60 @@
            Integer type = completeStudy.getType();
            if (Constants.ONE.equals(type)) {
                userStudyRecord.setListen(Constants.ONE_HUNDRED);
                userStudyRecord.setLook(Constants.BURDEN_ONE);
                userStudyRecord.setInduction(Constants.BURDEN_ONE);
                userStudyRecord.setAnswer(Constants.BURDEN_ONE);
                userStudyRecord.setPair(Constants.BURDEN_ONE);
            } else if (Constants.TWO.equals(type)) {
                userStudyRecord.setLook(Constants.ONE_HUNDRED);
                userStudyRecord.setInduction(Constants.BURDEN_ONE);
                userStudyRecord.setAnswer(Constants.BURDEN_ONE);
                userStudyRecord.setPair(Constants.BURDEN_ONE);
            } else if (Constants.THREE.equals(type)) {
                userStudyRecord.setInduction(Constants.ONE_HUNDRED);
                userStudyRecord.setAnswer(Constants.BURDEN_ONE);
                userStudyRecord.setPair(Constants.BURDEN_ONE);
            } else if (Constants.FOUR.equals(type)) {
                userStudyRecord.setAnswer(Constants.ONE_HUNDRED);
                userStudyRecord.setPair(Constants.BURDEN_ONE);
            } else if (Constants.FIVE.equals(type)) {
                Integer nextDay = DAY_MAP.get(String.valueOf(userStudyRecord.getDay()));
                // type为5并且day为5应该进入游戏日
                if (Constants.FIVE.equals(completeStudy.getDay())) {
                    userStudyRecord.setPair(Constants.ONE_HUNDRED);
                    // 游戏难度初始化 0(入门难度)
                    userStudyRecord.setGameDifficulty(Constants.ZERO);
                } else {
                    userStudyRecord.setListen(Constants.BURDEN_ONE);
                    userStudyRecord.setLook(Constants.BURDEN_ONE);
                    userStudyRecord.setInduction(Constants.BURDEN_ONE);
                    userStudyRecord.setAnswer(Constants.BURDEN_ONE);
                    userStudyRecord.setPair(Constants.BURDEN_ONE);
                }
                userStudyRecord.setDay(nextDay);
                userStudyRecord.setPair(Constants.ONE_HUNDRED);
            }
            if (userStudyRecord.getListen().equals(Constants.ONE_HUNDRED)){
                userStudyRecord.setDay(2);

            }
            if (userStudyRecord.getLook().equals(Constants.ONE_HUNDRED)){
                userStudyRecord.setDay(3);

            }
            if (userStudyRecord.getInduction().equals(Constants.ONE_HUNDRED)){
                userStudyRecord.setDay(4);

            }
            if (userStudyRecord.getAnswer().equals(Constants.ONE_HUNDRED)){
                userStudyRecord.setDay(5);

            }
            if (userStudyRecord.getPair().equals(Constants.ONE_HUNDRED)){
                userStudyRecord.setDay(6);

            }
            if (userStudyRecord.getDay().equals(Constants.SIX)) {
                // 游戏难度初始化 0(入门难度)
                userStudyRecord.setGameDifficulty(Constants.ZERO);
            }
//            if (userStudyRecord.getLook().equals(Constants.ONE_HUNDRED) &&
//                    userStudyRecord.getAnswer().equals(Constants.ONE_HUNDRED) &&
//                    userStudyRecord.getPair().equals(Constants.ONE_HUNDRED) &&
//                    userStudyRecord.getInduction().equals(Constants.ONE_HUNDRED) &&
//                    userStudyRecord.getListen().equals(Constants.ONE_HUNDRED)) {
//                // 学习完成，进入下一学习day
//                Integer nextDay = DAY_MAP.get(String.valueOf(userStudyRecord.getDay()));
//                userStudyRecord.setDay(nextDay);
//                // 下一day为 6，进入游戏日
//                if (nextDay.equals(Constants.SIX)) {
//                    // 游戏难度初始化 0(入门难度)
//                    userStudyRecord.setGameDifficulty(Constants.ZERO);
//                } else {
//                    // 重置学习进度
//                    userStudyRecord.setListen(Constants.BURDEN_ONE);
//                    userStudyRecord.setLook(Constants.BURDEN_ONE);
//                    userStudyRecord.setInduction(Constants.BURDEN_ONE);
//                    userStudyRecord.setAnswer(Constants.BURDEN_ONE);
//                    userStudyRecord.setPair(Constants.BURDEN_ONE);
//                }
//            }
        }
        // 更新学习时长
        userStudyRecord.setTotalStudy(userStudyRecord.getTotalStudy() + studyTime);
@@ -190,6 +205,7 @@
                        TStudy tStudy1 = studyList1.get(i + 1);
                        userStudy.setWeek(tStudy1.getWeek());
                    }
                    break;
                }
            }
            userStudy.setDay(DAY_MAP.get(String.valueOf(userStudy.getDay())));