迭代代码

无关风月

1 天以前 c97ae0369607c7091041273012b291d3b6e6bdc1

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java

@@ -1,11 +1,13 @@
package com.ruoyi.study.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.goods.api.feignClient.GoodsClient;
@@ -21,11 +23,22 @@
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.sound.sampled.*;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -82,68 +95,22 @@
    private ManagementClient managementClient;
    @Resource
    private ITUserPresentRecordService userPresentRecordService;
    @Resource
    private ITSubjectRecordDetailService subjectRecordDetailService;

    @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);
        TSubjectRecordDetail tSubjectRecordDetail = new TSubjectRecordDetail();
        tSubjectRecordDetail.setUserId(12);
        subjectRecordDetailService.save(tSubjectRecordDetail);

        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 = {"题目管理"})
@@ -152,6 +119,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());
@@ -165,21 +148,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.getError().isEmpty())) {
                        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);

        }
@@ -197,16 +189,46 @@
        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::getId).collect(Collectors.toList());
            collect.addAll(collect2);
            if (collect2.isEmpty()) {
                if (collect.isEmpty()) {
                    collect.add(-1);
                }
                wrapper.in("firstCategory", collect);
            }else{
                wrapper.in("secondCategory", collect2);
            }

        }
        if (StringUtils.hasLength(query.getEnglish())) {
            wrapper.like("english", query.getEnglish());
        }
        if (StringUtils.hasLength(query.getType())) {
            wrapper.like("type", query.getType());
        }
        List<TCategory> list5 = categoryService.list();
        wrapper.eq("state", 1);
        List<TSubject> list = subjectService.list(wrapper);

        switch (query.getStudyType()) {
            case 1:
                List<TSubject> list = subjectService.list(wrapper);
                for (TSubject tSubject : list) {
                    TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
                    TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
                    if (first != null && second != null) {
                        tSubject.setCategoryName(first.getName() + "-" + second.getName());
                    }
                }
                res.setRecords(list);
                res.setTotal(list.size());
                return R.ok(res);
@@ -216,6 +238,12 @@
                List<TSubject> list1 = subjectService.list(wrapper);
                List<TSubject> tSubjects = new ArrayList<>();
                for (TSubject tSubject : list1) {
                    TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
                    TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);

                    if (first != null && second != null) {
                        tSubject.setCategoryName(first.getName() + "-" + second.getName());
                    }
                    if (!tSubject.getError().isEmpty()) {
                        tSubjects.add(tSubject);
                    }
@@ -225,6 +253,14 @@
                return R.ok(res);
            case 3:
                List<TSubject> list2 = subjectService.list(wrapper);
                for (TSubject tSubject : list2) {
                    TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
                    TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);

                    if (first != null && second != null) {
                        tSubject.setCategoryName(first.getName() + "-" + second.getName());
                    }
                }
                res.setRecords(list2);
                res.setTotal(list2.size());
                return R.ok(res);
@@ -234,6 +270,11 @@
                List<TSubject> list3 = subjectService.list(wrapper);
                List<TSubject> tSubjects3 = new ArrayList<>();
                for (TSubject tSubject : list3) {
                    TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
                    TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
                    if (first != null && second != null) {
                        tSubject.setCategoryName(first.getName() + "-" + second.getName());
                    }
                    if (!tSubject.getError().isEmpty()) {
                        tSubjects3.add(tSubject);
                    }
@@ -243,6 +284,13 @@
                return R.ok(res);
            case 5:
                List<TSubject> list4 = subjectService.list(wrapper);
                for (TSubject tSubject : list4) {
                    TCategory first = list5.stream().filter(e->e.getId().equals(tSubject.getFirstCategory())).findFirst().orElse(null);
                    TCategory second = list5.stream().filter(e->e.getId().equals(tSubject.getSecondCategory())).findFirst().orElse(null);
                    if (first != null && second != null) {
                        tSubject.setCategoryName(first.getName() + "-" + second.getName());
                    }
                }
                res.setRecords(list4);
                res.setTotal(list4.size());
                return R.ok(res);
@@ -268,10 +316,12 @@
                .eq("week", week)
                .eq("type", type));
        one.setQuarter(dto.getQuarter());
        one.setQuarterRate(dto.getQuarterRate());
        one.setTitle(dto.getTitle());
        studyService.updateById(one);
        GameDTO game = dto.getGame();
        StoryListenDTO storyListen = dto.getStoryListen();
        System.err.println("学习配置"+dto);
        if (day == 6) {
            // 先判断有没有配置
            TGame studyId = gameService.getOne(new QueryWrapper<TGame>()
@@ -372,6 +422,15 @@
                storyListenService.save(tStoryListen);
            }
        } else {
            List<Integer> ids = studyListenService.lambdaQuery().eq(TStudyListen::getId, one.getId())
                    .eq(TStudyListen::getWeek, week)
                    .eq(TStudyListen::getDay, day).list().stream().map(TStudyListen::getId).collect(Collectors.toList());
            for (Integer id : ids) {
                subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                        .eq(TSubjectRecordDetail::getObjectId, id)
                        .eq(TSubjectRecordDetail::getWeek, week)
                        .eq(TSubjectRecordDetail::getType, 1));
            }
            // 删除原有数据
            studyListenService.remove(new QueryWrapper<TStudyListen>()
                    .eq("studyId", one.getId())
@@ -386,7 +445,17 @@
                tStudyListen.setIntegral(studyListenDTO.getIntegral());
                tStudyListen.setWeek(week);
                tStudyListen.setIsVip(studyListenDTO.getIsVip());
                tStudyListen.setRate(dto.getListenRate());
                studyListenService.save(tStudyListen);
            }
            List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
                    .eq(TStudyLook::getWeek, week)
                    .eq(TStudyLook::getDay, day).list().stream().map(TStudyLook::getId).collect(Collectors.toList());
            for (Integer id : ids1) {
                subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                        .eq(TSubjectRecordDetail::getObjectId, id)
                        .eq(TSubjectRecordDetail::getWeek, week)
                        .eq(TSubjectRecordDetail::getType, 2));
            }
            studyLookService.remove(new QueryWrapper<TStudyLook>()
                    .eq("studyId", one.getId())
@@ -402,7 +471,18 @@
                tStudyLook.setIntegral(studyLookDTO.getIntegral());
                tStudyLook.setWeek(week);
                tStudyLook.setIsVip(studyLookDTO.getIsVip());
                tStudyLook.setRate(dto.getLookRate());

                studyLookService.save(tStudyLook);
            }
            List<Integer> ids2 = studyInductionService.lambdaQuery().eq(TStudyInduction::getId, one.getId())
                    .eq(TStudyInduction::getWeek, week)
                    .eq(TStudyInduction::getDay, day).list().stream().map(TStudyInduction::getId).collect(Collectors.toList());
            for (Integer id : ids2) {
                subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                        .eq(TSubjectRecordDetail::getObjectId, id)
                        .eq(TSubjectRecordDetail::getWeek, week)
                        .eq(TSubjectRecordDetail::getType, 3));
            }
            studyInductionService.remove(new QueryWrapper<TStudyInduction>()
                    .eq("studyId", one.getId())
@@ -416,8 +496,19 @@
                tStudyInduction.setSubject(studyInductionDTO.getSubject());
                tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                tStudyInduction.setWeek(week);
                tStudyInduction.setRate(dto.getInductionRate());

                tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
                studyInductionService.save(tStudyInduction);
            }
            List<Integer> ids3 = studyAnswerService.lambdaQuery().eq(TStudyAnswer::getId, one.getId())
                    .eq(TStudyAnswer::getWeek, week)
                    .eq(TStudyAnswer::getDay, day).list().stream().map(TStudyAnswer::getId).collect(Collectors.toList());
            for (Integer id : ids3) {
                subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                        .eq(TSubjectRecordDetail::getObjectId, id)
                        .eq(TSubjectRecordDetail::getWeek, week)
                        .eq(TSubjectRecordDetail::getType, 4));
            }
            studyAnswerService.remove(new QueryWrapper<TStudyAnswer>()
                    .eq("studyId", one.getId())
@@ -433,8 +524,18 @@
                tStudyAnswer.setAnswerSubject(studyAnswerDTO.getAnswerSubject());
                tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
                tStudyAnswer.setWeek(week);
                tStudyAnswer.setRate(dto.getAnswerRate());
                tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
                studyAnswerService.save(tStudyAnswer);
            }
            List<Integer> ids4 = studyPairService.lambdaQuery().eq(TStudyPair::getId, one.getId())
                    .eq(TStudyPair::getWeek, week)
                    .eq(TStudyPair::getDay, day).list().stream().map(TStudyPair::getId).collect(Collectors.toList());
            for (Integer id : ids4) {
                subjectRecordDetailService.remove(new LambdaQueryWrapper<TSubjectRecordDetail>()
                        .eq(TSubjectRecordDetail::getObjectId, id)
                        .eq(TSubjectRecordDetail::getWeek, week)
                        .eq(TSubjectRecordDetail::getType, 5));
            }
            studyPairService.remove(new QueryWrapper<TStudyPair>()
                    .eq("studyId", one.getId())
@@ -448,11 +549,17 @@
                tStudyPair.setSubject(studyPairDTO.getSubject());
                tStudyPair.setIntegral(studyPairDTO.getIntegral());
                tStudyPair.setWeek(week);
                tStudyPair.setRate(dto.getPairRate());
                tStudyPair.setIsVip(studyPairDTO.getIsVip());
                studyPairService.save(tStudyPair);
            }
        }
        return R.ok();
    }

    public static void main(String[] args) throws Exception {
        double temp = 1.687;
        System.err.println((int) temp);
    }

    /**
@@ -467,10 +574,7 @@
                .eq("week", dto.getWeek())
                .eq("type", dto.getType()));
        if (one != null) {
            one.setType(dto.getType());
            one.setWeek(dto.getWeek());
            one.setTitle(dto.getTitle());
            one.setQuarter(dto.getQuarter());
            studyService.saveOrUpdate(one);
        } else {
            TStudy tStudy = new TStudy();
@@ -480,6 +584,82 @@
            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;
            List<TGame> games = gameService.list(new QueryWrapper<TGame>());
            List<TStoryListen> storyListens = storyListenService.list(new QueryWrapper<TStoryListen>());
            List<TStudyListen> studyListens = studyListenService.list();
            List<TStudyLook> studyLooks = studyLookService.list();
            List<TStudyInduction> studyInductions = studyInductionService.list();
            List<TStudyAnswer> studyAnswers = studyAnswerService.list();
            List<TStudyPair> studyPairs = studyPairService.list();
            for (TStudy tStudy : list1) {
                System.err.println("进入修改");
                tStudy.setWeek(i);
                // 将对应的题目配置修改week
                List<TGame> games1 = games.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TGame tGame : games1) {
                    tGame.setWeek(i);
                    tGame.setStudyId(tStudy.getId());
                    gameService.updateById(tGame);


                }
                // 听故事
                List<TStoryListen> storyListens1 = storyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStoryListen tStoryListen : storyListens1) {
                    tStoryListen.setWeek(i);
                    tStoryListen.setStudyId(tStudy.getId());
                    storyListenService.updateById(tStoryListen);

                }
                // 听音选图
                List<TStudyListen> studyListens1 = studyListens.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStudyListen tStudyListen : studyListens1) {
                    tStudyListen.setWeek(i);
                    tStudyListen.setStudyId(tStudy.getId());
                    studyListenService.updateById(tStudyListen);
                }
                // 看图选音
                List<TStudyLook> studyLooks1 = studyLooks.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStudyLook tStudyLook : studyLooks1) {
                    tStudyLook.setWeek(i);
                    tStudyLook.setStudyId(tStudy.getId());
                    studyLookService.updateById(tStudyLook);
                }
                // 归纳判断
                List<TStudyInduction> studyInductions1 = studyInductions.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStudyInduction tStudyInduction : studyInductions1) {
                    tStudyInduction.setWeek(i);
                    tStudyInduction.setStudyId(tStudy.getId());
                    System.err.println("归纳判断" + tStudy.getId());
                    studyInductionService.updateById(tStudyInduction);

                }
                List<TStudyAnswer> studyAnswers1 = studyAnswers.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStudyAnswer tStudyAnswer : studyAnswers1) {
                    tStudyAnswer.setStudyId(tStudy.getId());
                    tStudyAnswer.setWeek(i);
                    studyAnswerService.updateById(tStudyAnswer);

                }
                List<TStudyPair> studyPairs1 = studyPairs.stream().filter(e -> e.getWeek().equals(tStudy.getWeek())).collect(Collectors.toList());
                for (TStudyPair tStudyPair : studyPairs1) {
                    tStudyPair.setWeek(i);
                    tStudyPair.setStudyId(tStudy.getId());
                    studyPairService.updateById(tStudyPair);
                }
                i++;
            }
            studyService.updateBatchById(list1);
        }

        return R.ok();
    }

@@ -552,10 +732,12 @@
        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());
            res.setQuarterRate(list8.get(0).getQuarterRate());
        }
        List<StudyListenVO> listenVOS = new ArrayList<>();
        List<GameVO> gameVOS = new ArrayList<>();
@@ -572,13 +754,17 @@
        List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
                .eq("week", week)
                .eq("day", day));
        List<TSubject> list9 = subjectService.list();

        for (TStudyListen tStudyListen : list) {
            StringBuilder temp = new StringBuilder();
            StudyListenVO studyListenVO = new StudyListenVO();
            if (StringUtils.hasLength(tStudyListen.getSubject())) {
                for (String s : tStudyListen.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    temp.append(byId.getName()).append(",");
                    TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
                    if (byId != null) {
                        temp.append(byId.getName()).append(",");
                    }
                }
                String string = temp.toString();
                studyListenVO.setName(string.substring(0, string.length() - 1));
@@ -587,6 +773,7 @@
                studyListenVO.setIsVip(tStudyListen.getIsVip());
                listenVOS.add(studyListenVO);
            }
            res.setListenRate(tStudyListen.getRate());

        }
        // 看音选图
@@ -601,8 +788,10 @@
            StudyLookVO studyLookVO1 = new StudyLookVO();
            if (StringUtils.hasLength(tStudyLook.getSubject())) {
                for (String s : tStudyLook.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");
                    TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
                    if (byId != null) {
                        names.append(byId.getName()).append(",");
                    }
                    String[] split = tStudyLook.getSort().split(",");
                    String s1 = split[index];
                    sorts.append(s1).append(",");
@@ -617,6 +806,7 @@
                studyLookVO1.setIsVip(tStudyLook.getIsVip());
                lookVOS.add(studyLookVO1);
            }
            res.setLookRate(tStudyLook.getRate());

        }
        // 归纳排除
@@ -630,8 +820,10 @@
            if (StringUtils.hasLength(tStudyInduction.getSubject())) {
                for (String s : tStudyInduction.getSubject().split(",")) {
                    String replace = s.replace("-", "");
                    TSubject byId = subjectService.getById(replace);
                    names.append(byId.getName()).append(",");
                    TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(replace))).findFirst().orElse(null);
                    if (byId != null) {
                        names.append(byId.getName()).append(",");
                    }
                }
                String string = names.toString();
                studyInductionVO.setName(string.substring(0, string.length() - 1));
@@ -640,6 +832,7 @@
                studyInductionVO.setIsVip(tStudyInduction.getIsVip());
                inductionVOS.add(studyInductionVO);
            }
            res.setInductionRate(tStudyInduction.getRate());

        }
        // 有问有答
@@ -652,21 +845,31 @@
            if (tStudyAnswer.getIsAnswer() != null) {
                if (tStudyAnswer.getIsAnswer() == 1) {
                    if (tStudyAnswer.getSubject() != null) {
                        TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                        names.append(byId.getName()).append(",");

                        TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
                        if (byId != null) {
                            names.append(byId.getName()).append(",");
                        }
                    }
                    if (tStudyAnswer.getAnswerSubject() != null) {
                        TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                        names.append(byId1.getName()).append(",");

                        TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
                        if (byId1 != null) {
                            names.append(byId1.getName()).append(",");
                        }
                    }
                } else {
                    if (tStudyAnswer.getSubject() != null) {
                        TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
                        names.append(byId.getName()).append(",");
                        TSubject byId = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getSubject())).findFirst().orElse(null);
                        if (byId != null) {
                            names.append(byId.getName()).append(",");
                        }
                    }
                    if (tStudyAnswer.getAnswerSubject() != null) {
                        TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
                        names.append(byId1.getName()).append(",");
                        TSubject byId1 = list9.stream().filter(e -> e.getId().equals(tStudyAnswer.getAnswerSubject())).findFirst().orElse(null);
                        if (byId1 != null) {
                            names.append(byId1.getName()).append(",");
                        }
                    }
                }
            }
@@ -678,6 +881,8 @@
                studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
                studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
                answerVOS.add(studyAnswerVO);
                res.setAnswerRate(tStudyAnswer.getRate());

            }

        }
@@ -691,8 +896,11 @@
            StudyPairVO studyPairVO = new StudyPairVO();
            if (StringUtils.hasLength(tStudyPair.getSubject())) {
                for (String s : tStudyPair.getSubject().split(",")) {
                    TSubject byId = subjectService.getById(s);
                    names.append(byId.getName()).append(",");

                    TSubject byId = list9.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
                    if (byId != null) {
                        names.append(byId.getName()).append(",");
                    }
                }
                String string = names.toString();
                studyPairVO.setName(string.substring(0, string.length() - 1));
@@ -701,6 +909,8 @@
                studyPairVO.setIsVip(tStudyPair.getIsVip());
                pairVOS.add(studyPairVO);
            }
            res.setPairRate(tStudyPair.getRate());

        }
        List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
                .eq("week", week));
@@ -718,6 +928,9 @@
        }
        List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
                .eq("week", week));
        List<TStory> list10 = storyService.list();


        for (TStoryListen tStory : list6) {
            StoryVO storyVO = new StoryVO();
            storyVO.setStory(tStory.getStory());
@@ -728,14 +941,19 @@
            StringBuilder sort1 = new StringBuilder();
            if (StringUtils.hasLength(tStory.getStory())) {
                for (String s : tStory.getStory().split(",")) {
                    TStory byId = storyService.getById(s);
                    names.append(byId.getName()).append(",");
                    TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
                    if (byId != null) {
                        names.append(byId.getName()).append(",");
                    }
                }
            }
            if (StringUtils.hasLength(tStory.getLookStory())) {
                for (String s : tStory.getLookStory().split(",")) {
                    TStory byId = storyService.getById(s);
                    names1.append(byId.getName()).append(",");

                    TStory byId = list10.stream().filter(e -> e.getId().equals(Integer.valueOf(s))).findFirst().orElse(null);
                    if (byId != null) {
                        names1.append(byId.getName()).append(",");
                    }
                }
            }
            if (StringUtils.hasLength(tStory.getSort())) {
@@ -820,7 +1038,7 @@
    @GetMapping("/studySchedule")
    @ApiOperation(value = "获取用户学习进度", tags = {"学习端-首页"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true)
            @ApiImplicitParam(value = "周目", name = "week", dataType = "Integer", required = true),
    })
    public R<TUserStudy> studySchedule(@RequestParam Integer week) {
        LoginUserParent loginStudy = tokenService.getLoginUserStudy();
@@ -830,6 +1048,24 @@
        Integer userid = loginStudy.getUserid();
        TUserStudy studyRecord = userStudyService.lambdaQuery().eq(TUserStudy::getUserId, loginStudy.getUserid())
                .eq(TUserStudy::getDisabled, 0).one();
        TStudy study = studyService.lambdaQuery().eq(TStudy::getWeek, week).one();
        if (study.getQuarter()!=1){
            // 判断上季度 通关率
            String quarterRate = study.getQuarterRate();
            BigDecimal bigDecimal = new BigDecimal(quarterRate);
            // 查询五个自主学习通关率
            List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getWeek, week)
                    .eq(TSubjectRecordDetail::getUserId, userid).list();
            List<TSubjectRecordDetail> pass = list.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());
            if (list.isEmpty()){
                return R.fail("上季度未达到通关率"+quarterRate+"%,当前通关率0%");
            }
            BigDecimal divide = new BigDecimal(pass.size()).divide(new BigDecimal(list.size()), 2, RoundingMode.HALF_UP);
            if (divide.compareTo(bigDecimal)<1){
                return R.fail("上季度未达到通关率"+quarterRate+"%,当前通关率"+divide.multiply(new BigDecimal(100))+"%");
            }

        }
        if (null != studyRecord) {
            // 计算当前周 day 1-5的总进度
            int computeSchedule = studyService.computeSchedule(studyRecord, week);
@@ -893,6 +1129,7 @@
        List<StudyWeekDTO> result = studyService.weekList(type, quarter, loginUserStudy.getUserid());
        return R.ok(result);
    }


    /**
     * 获取在线时间赠送积分信息
@@ -1174,7 +1411,7 @@
                }
            }
        }
        return R.ok(studyService.listenSelectPicture(week, day, studyListens));
        return R.ok(studyService.listenSelectPicture(week, day, studyListens, tokenService.getLoginUserStudy().getUserid()));
    }

    /**
@@ -1205,7 +1442,7 @@
                }
            }
        }
        return R.ok(studyService.pictureSelectVoice(week, day, lookList));
        return studyService.pictureSelectVoice(week, day, lookList, tokenService.getLoginUserStudy().getUserid());
    }

    /**
@@ -1236,7 +1473,7 @@
                }
            }
        }
        return R.ok(studyService.induceExclude(week, day, inductionList));
        return studyService.induceExclude(week, day, inductionList, tokenService.getLoginUserStudy().getUserid());
    }

    /**
@@ -1267,7 +1504,7 @@
                }
            }
        }
        return R.ok(studyService.questionsAndAnswers(week, day, answerList));
        return studyService.questionsAndAnswers(week, day, answerList, tokenService.getLoginUserStudy().getUserid());
    }

    /**
@@ -1298,8 +1535,51 @@
                }
            }
        }
        return R.ok(studyService.pictureMateVoice(week, day, pairList));
        return studyService.pictureMateVoice(week, day, pairList, tokenService.getLoginUserStudy().getUserid());
    }

    /**
     * 2.0新增-记录答题状态
     */
    @PostMapping("/answerQuestion")
    @ApiOperation(value = "2.0新增-记录答题状态", tags = {"学习端-听-自主学习"})
    public R answerQuestion(@RequestBody @Validated AnswerQuestionDTO answerQuestionDTO) {
        LoginUserParent userStudy = tokenService.getLoginUserStudy();
        if (null == userStudy) {
            return R.tokenError("登录失效！");
        }
        System.err.println("答题DTO"+answerQuestionDTO);
        TSubjectRecordDetail byId = subjectRecordDetailService.getById(answerQuestionDTO.getId());
        byId.setUserId(null);
        byId.setStatus(answerQuestionDTO.getStatus());
        subjectRecordDetailService.updateById(byId);
        return R.ok();
    }

    /**
     * 2.0新增-重新开始
     */
    @PostMapping("/restart")
    @ApiOperation(value = "2.0新增-重新开始", tags = {"学习端-听-自主学习"})
    public R restart(@RequestBody RestartDTO restartDTO) {
        LoginUserParent userStudy = tokenService.getLoginUserStudy();
        if (null == userStudy) {
            return R.tokenError("登录失效！");
        }
        List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery()
                .eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
                .eq(TSubjectRecordDetail::getWeek, restartDTO.getWeek())
                .eq(TSubjectRecordDetail::getDay, restartDTO.getDay())
                .eq(TSubjectRecordDetail::getType, restartDTO.getType())
                .list();
        for (TSubjectRecordDetail tSubjectRecordDetail : list) {
            tSubjectRecordDetail.setStatus(1);
            tSubjectRecordDetail.setUserId(null);
        }
        subjectRecordDetailService.updateBatchById(list);
        return R.ok();
    }


    /**
     * 学习完成，生成学习记录，积分明细记录
@@ -1402,6 +1682,23 @@
        if (null == userStudy) {
            return R.tokenError("登录失效！");
        }
        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).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);
            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)){
                    return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        Integer[] array = {0, 1, 2};
        if (!Arrays.stream(array).collect(Collectors.toList()).contains(difficulty)) {
            throw new GlobalException("请选择符合规则的游戏难度！");
@@ -1448,6 +1745,23 @@
        if (null == userStudy) {
            return R.tokenError("登录失效！");
        }
        List<TSubjectRecordDetail> subjectRecordDetails = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userStudy.getUserid())
                .eq(TSubjectRecordDetail::getWeek, week).eq(BaseModel::getDisabled, 0).list();
        List<TSubjectRecordDetail> listenList = subjectRecordDetails.stream().filter(e -> e.getType() == 5).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);
            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)){
                    return R.fail("音图相配未达到通关率"+one.getRate()+"%,"+"当前通关率:"+divide.multiply(new BigDecimal(100))+"%");
                }
            }
        }
        TGame game = gameService.gameHearing(quarter, week);
        if (null == game) {
            throw new GlobalException("当前季度该周目暂无配置游戏数据！");
@@ -1462,6 +1776,8 @@
            photoList.add(new GameMemoryPhotoVO(tSubject.getId(), tSubject.getImg()));
            voiceList.add(new GameMemoryVoiceVO(tSubject.getId(), tSubject.getCorrect()));
        }
        photoList = photoList.stream().distinct().collect(Collectors.toList());
        voiceList = voiceList.stream().distinct().collect(Collectors.toList());
        // 校验超级听力是否通过
        // studyService.checkClearance(game,userStudy.getUserid());
        // 框架记忆数量翻倍，前端需要根据数量画格子
@@ -1486,7 +1802,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();
        // 生成随机索引并获取数据
@@ -1680,6 +1996,9 @@
    public R<StudyStoryListenResultVO> lookPictureDbu(@RequestParam Integer quarter, @RequestParam Integer week) {
        // 看图配音信息
        TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
        if (storyListen==null){
            return R.fail("当前未配置看图配音信息");
        }
        // 题组信息
        StudyStoryVO studyStory = new StudyStoryVO();
        studyStory.setId(storyListen.getId());
@@ -1703,6 +2022,9 @@
    public R<StudyStoryListenResultVO> frameworkMemory(@RequestParam Integer quarter, @RequestParam Integer week) {
        // 看图配音信息
        TStoryListen storyListen = storyListenService.storyDetail(quarter, week);
        if (storyListen==null){
            return R.fail("当前未配置框架记忆信息");
        }
        // 题组信息
        StudyStoryVO studyStory = new StudyStoryVO();
        studyStory.setId(storyListen.getId());