From 81714ac84eb9cf515c0dbf701b5b87d02bafb6bd Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 14:41:05 +0800
Subject: [PATCH] feat: 修复前后端联调Bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 97d187b..7803bfb 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
@@ -79,6 +79,8 @@
private TokenService tokenService;
@Resource
private ITSubjectRecordService subjectRecordService;
+ @Resource
+ private ManagementClient managementClient;
@PostMapping("/storyList")
// @ApiOperation(value = "配置学习类型选择故事", tags = {"题目管理"})
@@ -1071,8 +1073,13 @@
TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
// 获取对应图片语音
List<String> list = Arrays.asList(listen.getLookStory().split(","));
- return R.ok(new StudyStoryListenResultVO(listen,
- subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
+ List<TSubject> subjectList;
+ if (!list.isEmpty()) {
+ subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
+ } else {
+ subjectList = new ArrayList<>();
+ }
+ return R.ok(new StudyStoryListenResultVO(listen, subjectList));
}
/**
@@ -1090,8 +1097,13 @@
TStoryListen listen = storyListenService.lambdaQuery().eq(TStoryListen::getWeek, week).one();
// 获取对应图片语音
List<String> list = Arrays.asList(listen.getStory().split(","));
- return R.ok(new StudyStoryListenResultVO(listen,
- subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list()));
+ List<TSubject> subjectList;
+ if (!list.isEmpty()) {
+ subjectList = subjectService.lambdaQuery().in(TSubject::getId, list).eq(TSubject::getState, 1).list();
+ } else {
+ subjectList = new ArrayList<>();
+ }
+ return R.ok(new StudyStoryListenResultVO(listen,subjectList));
}
/**
@@ -1158,8 +1170,10 @@
.eq("type", 1)).size();
studyRecord.setSurplus(size-studyRecord.getWeek());
}else{
- studyRecord.setSurplus(studyService.list(new QueryWrapper<TStudy>()
+ TUserStudy tUserStudy = new TUserStudy();
+ tUserStudy.setSurplus(studyService.list(new QueryWrapper<TStudy>()
.eq("type", 1)).size());
+ studyRecord = tUserStudy;
}
// 游戏测试成绩
List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, userId)
@@ -1238,6 +1252,7 @@
integralRecord.setUpdateTime(new Date());
return R.ok(integralRecordService.save(integralRecord));
}
+
@GetMapping("/addIntegralDetail1")
// @ApiOperation(value = "添加-积分明细", tags = {"添加-积分明细"})
@ApiImplicitParams({
@@ -1247,7 +1262,7 @@
public R addIntegralDetail1(@RequestParam("integral") String integral, @RequestParam("method") String method) {
// 当前登录用户
LoginUserParent userStudy = tokenService.getLoginUser1();
- if (userStudy == null){
+ if (userStudy == null) {
return R.tokenError("登录失效");
}
// 生成积分明细信息
@@ -1280,6 +1295,7 @@
}
return R.ok(userService.updateById(user));
}
+
@GetMapping("/exchangeIntegral1")
// @ApiOperation(value = "用户积分变动", tags = {"用户积分变动"})
public R<Boolean> exchangeIntegral1(@RequestParam("integral") Integer integral, @RequestParam("method") String method) {
--
Gitblit v1.7.1