feat: 接口返回VO类;接口调试修改BUG

hjl

2024-05-22 ddee28676ae16b682651eea38f0c1071cf1565b8

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

@@ -10,6 +10,7 @@
import com.ruoyi.study.service.ITStudyService;
import com.ruoyi.study.service.ITSubjectService;
import com.ruoyi.study.service.ITUserStudyService;
import com.ruoyi.study.vo.*;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -70,64 +71,50 @@
    }

    @Override
    public Map<String, Object> listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens) {
    public StudyListenResultVO listenSelectPicture(Integer week, Integer day, List<TStudyListen> studyListens) {
        // 随机获取一组题
        Random rand = new Random();
        TStudyListen data = studyListens.get(rand.nextInt(studyListens.size()));
        List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
        Map<String, Object> result = new HashMap<>(8);
        result.put("data", data);
        result.put("subject", subjectList);
        return result;
        return new StudyListenResultVO(data, subjectList);
    }

    @Override
    public Map<String, Object> pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList) {
    public StudyLookResultVO pictureSelectVoice(Integer week, Integer day, List<TStudyLook> lookList) {
        // 随机获取一组题
        Random rand = new Random();
        TStudyLook data = lookList.get(rand.nextInt(lookList.size()));
        List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
        Map<String, Object> result = new HashMap<>(8);
        result.put("data", data);
        result.put("subject", subjectList);
        return result;
        return new StudyLookResultVO(data, subjectList);
    }

    @Override
    public Map<String, Object> induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList) {
    public StudyInductionResultVO induceExclude(Integer week, Integer day, List<TStudyInduction> inductionList) {
        // 随机获取一组题
        Random rand = new Random();
        TStudyInduction data = inductionList.get(rand.nextInt(inductionList.size()));
        List<TSubject> subjectList = getSubjects(data.getSubject().split(","));
        Map<String, Object> result = new HashMap<>(8);
        result.put("data", data);
        result.put("subject", subjectList);
        return result;
        return new StudyInductionResultVO(data, subjectList);
    }

    @Override
    public Map<String, Object> questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList) {
    public StudyAnswerResultVO questionsAndAnswers(Integer week, Integer day, List<TStudyAnswer> answerList) {
        // 随机获取一组题
        Random rand = new Random();
        TStudyAnswer data = answerList.get(rand.nextInt(answerList.size()));
        // 获取问题题目 和 回答题目
        Map<String, Object> result = new HashMap<>(8);
        List<String> ids = new ArrayList<>();
        ids.add(String.valueOf(data.getSubject()));
        ids.add(String.valueOf(data.getAnswerSubject()));
        result.put("data", data);
        // 有问有答
        result.put("subject", getSubjects(ids.toArray(ids.toArray(new String[0]))));
        return result;
        List<TSubject> subjects = getSubjects(ids.toArray(ids.toArray(new String[0])));
        return new StudyAnswerResultVO(data, subjects);
    }

    @Override
    public Map<String, Object> pictureMateVoice(Integer week, Integer day, TStudyPair pair) {
    public StudyPairResultVO pictureMateVoice(Integer week, Integer day, TStudyPair pair) {
        List<TSubject> subjectList = getSubjects(pair.getSubject().split(","));
        Map<String, Object> result = new HashMap<>(8);
        result.put("data", pair);
        result.put("subject", subjectList);
        return result;
        return new StudyPairResultVO(pair, subjectList);
    }

    /**