From 883d04c8d038ba0e45c1630f760f4aa642286f45 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期三, 22 五月 2024 10:50:48 +0800
Subject: [PATCH] feat: 微信分享更改;接口返回更改;接口参数描述
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
index c7c51cf..15966db 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/impl/TStudyServiceImpl.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.GlobalException;
-import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.study.domain.*;
import com.ruoyi.study.dto.StudyWeekDTO;
import com.ruoyi.study.mapper.TStudyMapper;
-import com.ruoyi.study.service.*;
+import com.ruoyi.study.service.ITGameRecordService;
+import com.ruoyi.study.service.ITStudyService;
+import com.ruoyi.study.service.ITSubjectService;
+import com.ruoyi.study.service.ITUserStudyService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -27,11 +30,11 @@
@Resource
private ITUserStudyService userStudyService;
@Resource
- private ITStudyListenService studyListenService;
- @Resource
private ITSubjectService subjectService;
@Resource
private ITGameRecordService gameRecordService;
+ @Resource
+ private TokenService tokenService;
private final static Map<String, Integer> GAME_DIFFICULTY_MAP = new HashMap<>();
@@ -58,7 +61,7 @@
throw new GlobalException("游戏等级异常，请重试！");
}
// 获取用户游戏进度
- Long userId = SecurityUtils.getUserId();
+ Integer userId = tokenService.getLoginUserStudy().getUserid();
List<TGameRecord> list = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId).eq(TGameRecord::getGameId, game.getId()).list();
boolean contains = list.stream().map(TGameRecord::getGameDifficulty).collect(Collectors.toList()).contains(level);
if (!contains) {
@@ -109,8 +112,12 @@
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);
- // todo 有问有答
+ // 有问有答
+ result.put("subject", getSubjects(ids.toArray(ids.toArray(new String[0]))));
return result;
}
--
Gitblit v1.7.1