迭代代码

无关风月

1 天以前 c97ae0369607c7091041273012b291d3b6e6bdc1

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

@@ -1,8 +1,11 @@
package com.ruoyi.study.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.study.domain.*;
import com.ruoyi.study.dto.StudyWeekDTO;
import com.ruoyi.study.mapper.TStudyMapper;
@@ -442,7 +445,28 @@
        List<List<TSubject>> subjectList = new ArrayList<>();

        StudyListenResultVO studyListenResultVO = new StudyListenResultVO(learnStudy, subjectList);

        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).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;
            TStudyListen one = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
                    .eq(TStudyListen::getDay, 1).last("limit 1").one();
            if (one!=null){
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    // 清空答题记录
                    subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                            .eq(TSubjectRecordDetail::getUserId, userid)
                            .eq(TSubjectRecordDetail::getWeek, week)
                            .eq(TSubjectRecordDetail::getDay,day)
                            .eq(TSubjectRecordDetail::getType
                            ,1));
                }
            }
        }
        List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week)
                .eq(TSubjectRecordDetail::getDay, day)
@@ -485,7 +509,8 @@
                    subs.add(data);
                }
                subjectList.add(subs);
                List<TSubjectRecordDetail> tSubjectRecordDetail1 = list.stream().filter(e -> e.getObjectId().equals(studyListen.getId())).collect(Collectors.toList());
                List<TSubjectRecordDetail> tSubjectRecordDetail1 = list.stream()
                        .filter(e -> e.getObjectId().equals(studyListen.getId())).collect(Collectors.toList());

                if (tSubjectRecordDetail1.isEmpty()){
                    for (int i = 0; i < 4; i++) {
@@ -496,9 +521,9 @@
                        tSubjectRecordDetail.setType(1);
                        tSubjectRecordDetail.setStatus(1);
                        tSubjectRecordDetail.setObjectId(studyListen.getId());
                        subjectRecordDetailService.save(tSubjectRecordDetail);
                        tSubjectRecordDetails.add(tSubjectRecordDetail);
                    }
                    subjectRecordDetailService.saveBatch(tSubjectRecordDetails);
                }else{
                    tSubjectRecordDetails.addAll(tSubjectRecordDetail1);
                }
@@ -515,7 +540,7 @@
    }

    @Override
    public StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userid) {
    public R<StudyLookResultVO> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList, Integer userid) {
        if (lookList.isEmpty()) {
            throw new GlobalException("当前学习周目题目数量不足！");
        }
@@ -535,7 +560,44 @@
        List<List<TSubject>> subjectList = new ArrayList<>();

        StudyLookResultVO studyListenResultVO = new StudyLookResultVO(learnStudy, subjectList);

        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 1).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);
            TStudyListen one = studyListenService.lambdaQuery().eq(TStudyListen::getWeek, week)
                    .eq(TStudyListen::getDay, 1).last("limit 1").one();
            if (one!=null){
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    return R.fail("听音选图未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
        int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count();
        int lookSize = lookList1.size();
        if (lookSize!=0){
            // 计算当前通关率
            double listenRate = (double) lookPass /lookSize;
            TStudyLook one = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
                    .eq(TStudyLook::getDay, 2).last("limit 1").one();
            if (one!=null){
                // 通关率未达标
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    // 清空答题记录
                    subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                            .eq(TSubjectRecordDetail::getUserId, userid)
                            .eq(TSubjectRecordDetail::getWeek, week)
                            .eq(TSubjectRecordDetail::getDay,day)
                            .eq(TSubjectRecordDetail::getType
                                    ,2));
                }
            }
        }
        List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week)
                .eq(TSubjectRecordDetail::getDay, day)
@@ -613,11 +675,11 @@
            studyListenResultVO.setList(tSubjectRecordDetails);
            studyListenResultVO.setSubjectList(subjectList);
        }
        return studyListenResultVO;
        return R.ok(studyListenResultVO);
    }

    @Override
    public StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList, Integer userid) {
    public R<StudyInductionResultVO> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList, Integer userid) {
        if (inductionList.isEmpty()) {
            throw new GlobalException("当前学习周目题目数量不足！");
        }
@@ -642,6 +704,44 @@
                .eq(TSubjectRecordDetail::getWeek, week)
                .eq(TSubjectRecordDetail::getDay, day)
                .eq(TSubjectRecordDetail::getType, 3).list();
        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 2).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);
            TStudyLook one = studyLookService.lambdaQuery().eq(TStudyLook::getWeek, week)
                    .eq(TStudyLook::getDay, 2).last("limit 1").one();
            if (one!=null){
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    return R.fail("看图选音未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
        int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count();
        int lookSize = lookList1.size();
        if (lookSize!=0){
            // 计算当前通关率
            double listenRate = (double) lookPass /lookSize;
            TStudyInduction one = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
                    .eq(TStudyInduction::getDay, 3).last("limit 1").one();
            if (one!=null){
                // 通关率未达标
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    // 清空答题记录
                    subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                            .eq(TSubjectRecordDetail::getUserId, userid)
                            .eq(TSubjectRecordDetail::getWeek, week)
                            .eq(TSubjectRecordDetail::getDay,day)
                            .eq(TSubjectRecordDetail::getType
                                    ,3));
                }
            }
        }
        if (list.isEmpty()) {
            List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>();
            for (TStudyInduction data : inductionList) {
@@ -752,13 +852,19 @@
                    .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP));
        }
        studyListenResultVO.setSubjectList(subjectList);
        return studyListenResultVO;
        return R.ok(studyListenResultVO);
    }

    @Override
    public StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList, Integer userid) {
    public R<StudyAnswerResultVO> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList, Integer userid) {
        if (answerList.isEmpty()) {
            throw new GlobalException("当前学习周目题目数量不足！");
        }
        if (answerList.size()<4){
            throw new GlobalException("当前学习周目题目数量不足！");
        }
        if (answerList.size()%4!=0){
            throw new GlobalException("当前学习周目题目数量不足");
        }
        // 题组信息
        LearnStudyVO learnStudy = new LearnStudyVO();
@@ -781,6 +887,44 @@
                .eq(TSubjectRecordDetail::getWeek, week)
                .eq(TSubjectRecordDetail::getDay, day)
                .eq(TSubjectRecordDetail::getType, 4).list();
        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 3).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);
            TStudyInduction one = studyInductionService.lambdaQuery().eq(TStudyInduction::getWeek, week)
                    .eq(TStudyInduction::getDay, 3).last("limit 1").one();
            if (one!=null){
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
        int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count();
        int lookSize = lookList1.size();
        if (lookSize!=0){
            // 计算当前通关率
            double listenRate = (double) lookPass /lookSize;
            TStudyAnswer one = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
                    .eq(TStudyAnswer::getDay, 4).last("limit 1").one();
            if (one!=null){
                // 通关率未达标
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    // 清空答题记录
                    subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                            .eq(TSubjectRecordDetail::getUserId, userid)
                            .eq(TSubjectRecordDetail::getWeek, week)
                            .eq(TSubjectRecordDetail::getDay,day)
                            .eq(TSubjectRecordDetail::getType
                                    ,4));
                }
            }
        }
        if (list.isEmpty()) {
            List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>();
            for (int i = 0; i < answerList.size(); i += Constants.TWO) {
@@ -791,13 +935,6 @@
                voAdd(voList, one);
                voAdd(voList, two);
                subjectList.add(voList);
            }
            for (int i = 0; i < answerList.size(); i += 4) {
                // 一组题目为四道题，
                TStudyAnswer one = answerList.get(i);
                TStudyAnswer two = answerList.get(i + 1);
                TStudyAnswer three = answerList.get(i + 2);
                TStudyAnswer four = answerList.get(i + 3);
                TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail();
                tSubjectRecordDetail.setUserId(userid);
                tSubjectRecordDetail.setWeek(week);
@@ -806,15 +943,15 @@
                tSubjectRecordDetail.setStatus(1);
                tSubjectRecordDetail.setOne(one.getId());
                tSubjectRecordDetail.setTwo(two.getId());
                tSubjectRecordDetail.setThree(three.getId());
                tSubjectRecordDetail.setFour(four.getId());
                tSubjectRecordDetails.add(tSubjectRecordDetail);
            }

            subjectRecordDetailService.saveBatch(tSubjectRecordDetails);
            studyListenResultVO.setList(tSubjectRecordDetails);
            studyListenResultVO.setAccuracy(new BigDecimal("0.00"));

        } else {
            List<TSubjectRecordDetail> tSubjectRecordDetails1 = new ArrayList<TSubjectRecordDetail>();
            List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>();
            for (int i = 0; i < answerList.size(); i += Constants.TWO) {
                List<QuestionsAnswersSubjectVO> voList = new ArrayList<>();
@@ -824,31 +961,14 @@
                voAdd(voList, one);
                voAdd(voList, two);
                subjectList.add(voList);
            }


            List<TSubjectRecordDetail> tSubjectRecordDetails1 = new ArrayList<TSubjectRecordDetail>();

            for (int i = 0; i < answerList.size(); i += 4) {
                TStudyAnswer one = answerList.get(i);
                TStudyAnswer two = answerList.get(i + 1);
                TStudyAnswer three = answerList.get(i + 2);
                TStudyAnswer four = answerList.get(i + 3);
                TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail();
                tSubjectRecordDetail.setUserId(userid);
                tSubjectRecordDetail.setWeek(week);
                tSubjectRecordDetail.setDay(day);
                tSubjectRecordDetail.setType(4);
                int size = list.size();
                if (size-1>=i/4){
                    tSubjectRecordDetail.setStatus(list.get(i/4).getStatus());
                }else{
                    tSubjectRecordDetail.setStatus(1);
                }
                tSubjectRecordDetail.setStatus(1);
                tSubjectRecordDetail.setOne(one.getId());
                tSubjectRecordDetail.setTwo(two.getId());
                tSubjectRecordDetail.setThree(three.getId());
                tSubjectRecordDetail.setFour(four.getId());
                tSubjectRecordDetails.add(tSubjectRecordDetail);
                tSubjectRecordDetails1.add(tSubjectRecordDetail);
            }
@@ -861,7 +981,7 @@
                    .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP));
        }
        studyListenResultVO.setSubjectList(subjectList);
        return studyListenResultVO;
        return R.ok(studyListenResultVO);
    }

    private void voAdd(List<QuestionsAnswersSubjectVO> voList, TStudyAnswer one) {
@@ -903,7 +1023,7 @@
    }

    @Override
    public StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair, Integer userid) {
    public R<StudyPairResultVO> pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair, Integer userid) {
        if (pair.isEmpty()) {
            throw new GlobalException("当前学习周目题目数量不足！");
        }
@@ -928,6 +1048,44 @@
                .eq(TSubjectRecordDetail::getWeek, week)
                .eq(TSubjectRecordDetail::getDay, day)
                .eq(TSubjectRecordDetail::getType, 5).list();
        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 4).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);
            TStudyAnswer one = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getWeek, week)
                    .eq(TStudyAnswer::getDay, 4).last("limit 1").one();
            if (one!=null){
                if (listenRate<(Double.parseDouble(one.getRate())/100)){
                    return R.fail("归纳排除未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        List<TSubjectRecordDetail> lookList1 = subjectRecordDetails.stream().filter(e -> e.getType() == 5).collect(Collectors.toList());
        int lookPass = (int) lookList1.stream().filter(e -> e.getStatus() == 2).count();
        int lookSize = lookList1.size();
        if (lookSize!=0){
            // 计算当前通关率
            double listenRate = (double) lookPass /lookSize;
            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)){
                    // 清空答题记录
                    subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                            .eq(TSubjectRecordDetail::getUserId, userid)
                            .eq(TSubjectRecordDetail::getWeek, week)
                            .eq(TSubjectRecordDetail::getDay,day)
                            .eq(TSubjectRecordDetail::getType
                                    ,5));
                }
            }
        }
        if (list.isEmpty()) {
            List<TSubjectRecordDetail> tSubjectRecordDetails = new ArrayList<>();
            for (TStudyPair data : pair) {
@@ -980,8 +1138,8 @@
                    tSubjectRecordDetail.setType(5);
                    tSubjectRecordDetail.setStatus(1);
                    tSubjectRecordDetail.setObjectId(data.getId());
                    tSubjectRecordDetails.add(tSubjectRecordDetail);
                    subjectRecordDetailService.save(tSubjectRecordDetail);
                    tSubjectRecordDetails.add(tSubjectRecordDetail);
                }else{
                    tSubjectRecordDetails.addAll(tSubjectRecordDetail1);
                }
@@ -991,13 +1149,14 @@
            studyListenResultVO.setAccuracy(new BigDecimal(tSubjectRecordDetails.stream().filter(tSubjectRecordDetail -> tSubjectRecordDetail.getStatus().equals(2)).count())
                    .divide(new BigDecimal(tSubjectRecordDetails.size()), 2, RoundingMode.HALF_UP));
        }
        return studyListenResultVO;
        System.err.println("音图相配返回VO"+studyListenResultVO.getList());
        return R.ok(studyListenResultVO);
    }

    @Override
    public int computeSchedule(TUserStudy result, Integer week) {
        System.err.println("用户学习进度"+result);
        List<TStudy> studyList = this.lambdaQuery().eq(TStudy::getDisabled, 0)
                .eq(TStudy::getType, 1)
                .orderByAsc(TStudy::getWeek).list();
        // 基础学习进度
        Integer day = result.getDay();
@@ -1027,6 +1186,8 @@
                thisQuarter = key;
            }
        }
        System.err.println("当前进入周目所属季度"+studyQuarter);
        System.err.println("进入周目所属季度"+thisQuarter);
        // 默认进度为 0
        int defaultSchedule;
        // 季度判断
@@ -1044,6 +1205,7 @@
            } else if (studyIndex < weekIndex) {
                defaultSchedule = 0;
            } else {
                System.err.println("学习到Day"+day);
                // 根据day初始化学习进度
                if (Constants.ONE.equals(day)) {
                    defaultSchedule = 0;
@@ -1056,7 +1218,7 @@
                } else if (Constants.FIVE.equals(day)) {
                    defaultSchedule = 80;
                } else {
                    defaultSchedule = 0;
                    defaultSchedule = 80;
                }
                // 根据五种学习计算进度
                Integer listen = result.getListen();
@@ -1081,46 +1243,7 @@
                }
            }
        }
        // week以超过当前week，进度为 100%
        /*if (itemBool) {
            defaultSchedule = 100;
        } 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);
            }
        }*/

        return defaultSchedule;
    }