From afb2bc8e77e086ebeb358915e12fad41dac78a6a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 14:41:34 +0800
Subject: [PATCH] 1020更新

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java |  247 +++++++++++++++++++++++++++++++------------------
 1 files changed, 157 insertions(+), 90 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index 06191f1..6f3f1f6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.constant.Constants;
@@ -183,9 +184,9 @@
 
     @PostMapping("/subjectList")
 //    @ApiOperation(value = "配置学习类型选择题目", tags = {"题目管理"})
-    public R<PageInfo<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
-        PageInfo<TSubject> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
-        QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
+    public R<IPage<TSubject>> subjectList(@RequestBody ChoiceSubject query) {
+        // 创建分页对象,传入当前页和每页显示条数
+        IPage<TSubject> page = new Page<>(query.getPageNumber(), query.getPageSize());        QueryWrapper<TSubject> wrapper = new QueryWrapper<>();
         if (StringUtils.hasLength(query.getName())) {
             wrapper.like("name", query.getName());
         }
@@ -198,12 +199,17 @@
             List<Integer> collect2 = categoryService.lambdaQuery().eq(TCategory::getState, 1)
                     .eq(TCategory::getType, 2)
                     .like(TCategory::getName, query.getCategoryName()).list()
-                    .stream().map(TCategory::getParentId).collect(Collectors.toList());
+                    .stream().map(TCategory::getId).collect(Collectors.toList());
             collect.addAll(collect2);
-            if (collect.isEmpty()) {
-                collect.add(-1);
+            if (collect2.isEmpty()) {
+                if (collect.isEmpty()) {
+                    collect.add(-1);
+                }
+                wrapper.in("firstCategory", collect);
+            }else{
+                wrapper.in("secondCategory", collect2);
             }
-            wrapper.in("firstCategory", collect);
+
         }
         if (StringUtils.hasLength(query.getEnglish())) {
             wrapper.like("english", query.getEnglish());
@@ -211,21 +217,22 @@
         if (StringUtils.hasLength(query.getType())) {
             wrapper.like("type", query.getType());
         }
+        List<TCategory> list5 = categoryService.list();
         wrapper.eq("state", 1);
+        // 执行分页查询
+        IPage<TSubject> res = subjectService.page(page, wrapper);
+        List<TSubject> list = res.getRecords();
+
         switch (query.getStudyType()) {
             case 1:
-                List<TSubject> list = subjectService.list(wrapper);
                 for (TSubject tSubject : list) {
-                    TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
-                    TCategory second = categoryService.getById(tSubject.getSecondCategory());
-
+                    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);
             case 2:
                 // 查询出error字段不为空的数据
@@ -233,9 +240,8 @@
                 List<TSubject> list1 = subjectService.list(wrapper);
                 List<TSubject> tSubjects = new ArrayList<>();
                 for (TSubject tSubject : list1) {
-                    TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
-                    TCategory second = categoryService.getById(tSubject.getSecondCategory());
+                    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());
@@ -245,20 +251,18 @@
                     }
                 }
                 res.setRecords(tSubjects);
-                res.setTotal(tSubjects.size());
                 return R.ok(res);
             case 3:
                 List<TSubject> list2 = subjectService.list(wrapper);
                 for (TSubject tSubject : list2) {
-                    TCategory first = categoryService.getById(tSubject.getFirstCategory());
-                    TCategory second = categoryService.getById(tSubject.getSecondCategory());
+                    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);
             case 4:
                 // 查询出error字段不为空的数据
@@ -266,9 +270,8 @@
                 List<TSubject> list3 = subjectService.list(wrapper);
                 List<TSubject> tSubjects3 = new ArrayList<>();
                 for (TSubject tSubject : list3) {
-                    TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
-                    TCategory second = categoryService.getById(tSubject.getSecondCategory());
+                    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());
                     }
@@ -277,20 +280,17 @@
                     }
                 }
                 res.setRecords(tSubjects3);
-                res.setTotal(tSubjects3.size());
                 return R.ok(res);
             case 5:
                 List<TSubject> list4 = subjectService.list(wrapper);
                 for (TSubject tSubject : list4) {
-                    TCategory first = categoryService.getById(tSubject.getFirstCategory());
-
-                    TCategory second = categoryService.getById(tSubject.getSecondCategory());
+                    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);
         }
         List<TSubject> objects = new ArrayList<>();
@@ -319,6 +319,7 @@
         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>()
@@ -350,6 +351,8 @@
                 studyId.setAnswerCount(game.getAnswerCount());
                 studyId.setRate(game.getRate());
                 studyId.setAnswerRate(game.getAnswerRate());
+                studyId.setSubjectIds(game.getSubjectIds());
+                studyId.setSubjectIdsOne(game.getSubjectIdsOne());
                 gameService.updateById(studyId);
             } else {
                 // 判断当前周目配置的题目数量
@@ -378,6 +381,8 @@
                 tGame.setAnswerTime(game.getAnswerTime());
                 tGame.setAnswerIntegral(game.getAnswerIntegral());
                 tGame.setAnswerCount(game.getAnswerCount());
+                tGame.setSubjectIds(game.getSubjectIds());
+                tGame.setSubjectIdsOne(game.getSubjectIdsOne());
                 gameService.save(tGame);
             }
 
@@ -419,6 +424,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())
@@ -434,7 +448,17 @@
                 tStudyListen.setWeek(week);
                 tStudyListen.setIsVip(studyListenDTO.getIsVip());
                 tStudyListen.setRate(dto.getListenRate());
+                tStudyListen.setStudySort(studyListenDTO.getStudySort());
                 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())
@@ -451,8 +475,17 @@
                 tStudyLook.setWeek(week);
                 tStudyLook.setIsVip(studyLookDTO.getIsVip());
                 tStudyLook.setRate(dto.getLookRate());
-
+                tStudyLook.setStudySort(studyLookDTO.getStudySort());
                 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())
@@ -467,9 +500,19 @@
                 tStudyInduction.setIntegral(studyInductionDTO.getIntegral());
                 tStudyInduction.setWeek(week);
                 tStudyInduction.setRate(dto.getInductionRate());
-
                 tStudyInduction.setIsVip(studyInductionDTO.getIsVip());
+                tStudyInduction.setStudySort(studyInductionDTO.getStudySort());
+
                 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())
@@ -486,9 +529,20 @@
                 tStudyAnswer.setIntegral(studyAnswerDTO.getIntegral());
                 tStudyAnswer.setWeek(week);
                 tStudyAnswer.setRate(dto.getAnswerRate());
-
                 tStudyAnswer.setIsVip(studyAnswerDTO.getIsVip());
+                tStudyAnswer.setStudySort(studyAnswerDTO.getStudySort());
+
+
                 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())
@@ -504,6 +558,7 @@
                 tStudyPair.setWeek(week);
                 tStudyPair.setRate(dto.getPairRate());
                 tStudyPair.setIsVip(studyPairDTO.getIsVip());
+                tStudyPair.setStudySort(studyPairDTO.getStudySort());
                 studyPairService.save(tStudyPair);
             }
         }
@@ -706,7 +761,7 @@
         // 听音选图
         List<TStudyListen> list = studyListenService.list(new QueryWrapper<TStudyListen>()
                 .eq("week", week)
-                .eq("day", day));
+                .eq("day", day).orderByAsc("studySort"));
         List<TSubject> list9 = subjectService.list();
 
         for (TStudyListen tStudyListen : list) {
@@ -724,6 +779,8 @@
                 studyListenVO.setIntegral(tStudyListen.getIntegral());
                 studyListenVO.setSubject(tStudyListen.getSubject());
                 studyListenVO.setIsVip(tStudyListen.getIsVip());
+                studyListenVO.setId(tStudyListen.getId());
+                studyListenVO.setType(tStudyListen.getType());
                 listenVOS.add(studyListenVO);
             }
             res.setListenRate(tStudyListen.getRate());
@@ -732,7 +789,7 @@
         // 看音选图
         List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
                 .eq("week", week)
-                .eq("day", day)
+                .eq("day", day).orderByAsc("studySort")
         );
         for (TStudyLook tStudyLook : list1) {
             int index = 0;
@@ -757,6 +814,8 @@
                 studyLookVO1.setIntegral(tStudyLook.getIntegral());
                 studyLookVO1.setSubject(tStudyLook.getSubject());
                 studyLookVO1.setIsVip(tStudyLook.getIsVip());
+                studyLookVO1.setId(tStudyLook.getId());
+
                 lookVOS.add(studyLookVO1);
             }
             res.setLookRate(tStudyLook.getRate());
@@ -765,7 +824,7 @@
         // 归纳排除
         List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
                 .eq("week", week)
-                .eq("day", day)
+                .eq("day", day).orderByAsc("studySort")
         );
         for (TStudyInduction tStudyInduction : list2) {
             StringBuilder names = new StringBuilder();
@@ -783,6 +842,8 @@
                 studyInductionVO.setIntegral(tStudyInduction.getIntegral());
                 studyInductionVO.setSubject(tStudyInduction.getSubject());
                 studyInductionVO.setIsVip(tStudyInduction.getIsVip());
+                studyInductionVO.setId(tStudyInduction.getId());
+
                 inductionVOS.add(studyInductionVO);
             }
             res.setInductionRate(tStudyInduction.getRate());
@@ -791,7 +852,7 @@
         // 有问有答
         List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
                 .eq("week", week)
-                .eq("day", day));
+                .eq("day", day).orderByAsc("studySort"));
         for (TStudyAnswer tStudyAnswer : list3) {
             StringBuilder names = new StringBuilder();
             StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
@@ -833,6 +894,8 @@
                 studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
                 studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
                 studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
+                studyAnswerVO.setId(tStudyAnswer.getId());
+
                 answerVOS.add(studyAnswerVO);
                 res.setAnswerRate(tStudyAnswer.getRate());
 
@@ -842,7 +905,7 @@
         // 音图相配
         List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
                 .eq("week", week)
-                .eq("day", day)
+                .eq("day", day).orderByAsc("studySort")
         );
         for (TStudyPair tStudyPair : list4) {
             StringBuilder names = new StringBuilder();
@@ -860,6 +923,7 @@
                 studyPairVO.setIntegral(tStudyPair.getIntegral());
                 studyPairVO.setSubject(tStudyPair.getSubject());
                 studyPairVO.setIsVip(tStudyPair.getIsVip());
+                studyPairVO.setId(tStudyPair.getId());
                 pairVOS.add(studyPairVO);
             }
             res.setPairRate(tStudyPair.getRate());
@@ -877,6 +941,16 @@
             gameVO.setAnswerCount(tGame.getAnswerCount());
             gameVO.setRate(tGame.getRate());
             gameVO.setAnswerRate(tGame.getAnswerRate());
+            String subjectIds = tGame.getSubjectIds();
+            if(subjectIds!=null && subjectIds.length()>0){
+                gameVO.setSubjects(subjectService.list(new QueryWrapper<TSubject>()
+                        .in("id", subjectIds.split(","))));
+            }
+            String subjectIdsOne = tGame.getSubjectIdsOne();
+            if(subjectIdsOne!=null && subjectIdsOne.length()>0){
+                gameVO.setSubjectsOne(subjectService.list(new QueryWrapper<TSubject>()
+                        .in("id", subjectIdsOne.split(","))));
+            }
             gameVOS.add(gameVO);
         }
         List<TStoryListen> list6 = storyListenService.list(new QueryWrapper<TStoryListen>()
@@ -1058,58 +1132,6 @@
             if (listen != 100 && listen != -1) {
                 studyRecord.setListen(100 - listen);
             }
-//            // 自主学习答题记录 查询通关率
-//            List<TSubjectRecordDetail> list = subjectRecordDetailService.lambdaQuery().eq(TSubjectRecordDetail::getUserId, userid)
-//                    .eq(TSubjectRecordDetail::getWeek, week).ne(BaseModel::getDisabled, 0).list();
-//            List<TSubjectRecordDetail> listenList = list.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
-//            int listenPass = (int) listenList.stream().filter(e -> e.getStatus() == 2).count();
-//            List<TSubjectRecordDetail> lookList = list.stream().filter(e -> e.getType() == 2).collect(Collectors.toList());
-//            int lookPass = (int) lookList.stream().filter(e -> e.getStatus() == 2).count();
-//            List<TSubjectRecordDetail> inductionList = list.stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
-//            int inductionPass = (int) inductionList.stream().filter(e -> e.getStatus() == 2).count();
-//            List<TSubjectRecordDetail> answerList = list.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
-//            int answerPass = (int) answerList.stream().filter(e -> e.getStatus() == 2).count();
-//            List<TSubjectRecordDetail> pairList = list.stream().filter(e -> e.getType() == 5).collect(Collectors.toList());
-//            int pairPass = (int) pairList.stream().filter(e -> e.getStatus() == 2).count();
-//            int listenSize = listenList.size();
-//            if (listenSize!=0){
-//                double listenRate = (double) listenPass /listenSize;
-//                studyRecord.setListen((int)listenRate);
-//            }else{
-//                studyRecord.setListen(-1);
-//            }
-//            int lookSize = lookList.size();
-//            if (lookSize!=0) {
-//                double lookRate = (double) lookPass / lookSize;
-//                studyRecord.setLook((int) lookRate);
-//            }else{
-//                studyRecord.setLook(-1);
-//            }
-//            int inductionSize = inductionList.size();
-//
-//            if (inductionSize!=0) {
-//                double inductionRate = (double) inductionPass /inductionSize;
-//                studyRecord.setInduction((int)inductionRate);
-//            }else{
-//                studyRecord.setInduction(-1);
-//            }
-//
-//            int answerSize = answerList.size();
-//            if (answerSize!=0) {
-//                double answerRate = (double) answerPass /answerSize;
-//                studyRecord.setAnswer((int)answerRate);
-//            }else{
-//                studyRecord.setAnswer(-1);
-//            }
-//
-//            int pairSize = pairList.size();
-//            if (pairSize!=0) {
-//                double pairRate = (double) pairPass /pairSize;
-//                studyRecord.setPair((int)pairRate);
-//            }else{
-//                studyRecord.setPair(-1);
-//            }
-
         }
         return R.ok(studyRecord);
     }
@@ -1553,6 +1575,7 @@
         if (null == userStudy) {
             return R.tokenError("登录失效!");
         }
+        System.err.println("答题DTO"+answerQuestionDTO);
         TSubjectRecordDetail byId = subjectRecordDetailService.getById(answerQuestionDTO.getId());
         byId.setUserId(null);
         byId.setStatus(answerQuestionDTO.getStatus());
@@ -1715,7 +1738,19 @@
         game.setTime(game.getTime().split(",")[difficulty]);
         // 检验是否完成难度
         studyService.checkDifficulty(difficulty, week, game, userStudy.getUserid());
-        List<String> subjectId = getSubjectId(week);
+
+
+//        List<String> subjectId = getSubjectId(week);
+        List<String> subjectId = new ArrayList<>();
+        String subjectIds = game.getSubjectIds();
+        if(subjectIds!=null){
+            String[] split = subjectIds.split(",");
+            for (String s : split) {
+                subjectId.add(s);
+            }
+        }
+
+
         List<String> newSubjectId = subjectId.stream().map(data -> {
             if (data.startsWith(Constants.REDUCE)) {
                 data = data.replace(Constants.REDUCE, Constants.EMPTY_STR);
@@ -1770,7 +1805,16 @@
         if (null == game) {
             throw new GlobalException("当前季度该周目暂无配置游戏数据!");
         }
-        List<String> subjectId = getSubjectId(week);
+//        List<String> subjectId = getSubjectId(week);
+        List<String> subjectId = new ArrayList<>();
+        String subjectIds = game.getSubjectIdsOne();
+        if(subjectIds!=null){
+            String[] split = subjectIds.split(",");
+            for (String s : split) {
+                subjectId.add(s);
+            }
+        }
+
         List<String> subjectData = getSubjectData(game, subjectId);
         List<TSubject> subjectList = getSubjectList(subjectData);
         // 返回数据
@@ -1780,6 +1824,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());
         // 框架记忆数量翻倍,前端需要根据数量画格子
@@ -2454,5 +2500,26 @@
         return R.ok(userService.updateById(user));
     }
 
+    @GetMapping("/lookVideo")
+//    @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
+    public R<Boolean> lookVideo() {
+        boolean update = userService.update(new LambdaUpdateWrapper<TUser>().set(TUser::getLookVideo, 0));
+        return R.ok(update);
+    }
+
+    /**
+     * 设置题组类型 常规 示例
+     * @param dto
+     * @return
+     */
+    @PostMapping("/setStudyType")
+    public R<Object> setStudyType(@RequestBody SetStudyTypeDto dto){
+        TStudyListen studyListen = studyListenService.getById(dto.getId());
+        studyListen.setType(dto.getType());
+        studyListen.setSubject(dto.getSubject());
+        return R.ok(studyListenService.updateById(studyListen));
+
+    }
+
 }
 

--
Gitblit v1.7.1