From fa06e9ec7a8106a450c6ef26edbf73a276cc5854 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 28 五月 2024 17:35:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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 98d2a9c..43045c2 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
@@ -28,6 +28,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -344,13 +345,13 @@
TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
.eq("week", dto.getWeek())
.eq("type", dto.getType()));
- if (one!=null){
+ if (one != null) {
one.setType(dto.getType());
one.setWeek(dto.getWeek());
one.setTitle(dto.getTitle());
one.setQuarter(dto.getQuarter());
studyService.saveOrUpdate(one);
- }else{
+ } else {
TStudy tStudy = new TStudy();
tStudy.setType(dto.getType());
tStudy.setWeek(dto.getWeek());
@@ -453,7 +454,7 @@
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
- if (StringUtils.hasLength(tStudyListen.getSubject())){
+ if (StringUtils.hasLength(tStudyListen.getSubject())) {
for (String s : tStudyListen.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
temp.append(byId.getName()).append(",");
@@ -477,7 +478,7 @@
StringBuilder names = new StringBuilder();
StringBuilder sorts = new StringBuilder();
StudyLookVO studyLookVO1 = new StudyLookVO();
- if (StringUtils.hasLength(tStudyLook.getSubject())){
+ if (StringUtils.hasLength(tStudyLook.getSubject())) {
for (String s : tStudyLook.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
names.append(byId.getName()).append(",");
@@ -505,7 +506,7 @@
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
StudyInductionVO studyInductionVO = new StudyInductionVO();
- if (StringUtils.hasLength(tStudyInduction.getSubject())){
+ if (StringUtils.hasLength(tStudyInduction.getSubject())) {
for (String s : tStudyInduction.getSubject().split(",")) {
String replace = s.replace("-", "");
TSubject byId = subjectService.getById(replace);
@@ -527,34 +528,34 @@
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
- if (tStudyAnswer.getIsAnswer() != null){
+ if (tStudyAnswer.getIsAnswer() != null) {
if (tStudyAnswer.getIsAnswer() == 1) {
- if (tStudyAnswer.getSubject()!=null){
+ if (tStudyAnswer.getSubject() != null) {
TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
names.append(byId.getName()).append(",");
}
- if (tStudyAnswer.getAnswerSubject()!=null) {
+ if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
names.append(byId1.getName()).append(",");
}
} else {
- if (tStudyAnswer.getSubject()!=null) {
+ if (tStudyAnswer.getSubject() != null) {
TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
names.append(byId.getName()).append(",");
}
- if (tStudyAnswer.getAnswerSubject()!=null) {
+ if (tStudyAnswer.getAnswerSubject() != null) {
TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
names.append(byId1.getName()).append(",");
}
}
}
- if (StringUtils.hasLength(names)){
+ if (StringUtils.hasLength(names)) {
String string = names.toString();
studyAnswerVO.setName(string.substring(0, string.length() - 1));
studyAnswerVO.setIntegral(tStudyAnswer.getIntegral());
studyAnswerVO.setIsVip(tStudyAnswer.getIsVip());
studyAnswerVO.setIsAnswer(tStudyAnswer.getIsAnswer());
- studyAnswerVO.setSubject(tStudyAnswer.getSubject()+","+tStudyAnswer.getAnswerSubject());
+ studyAnswerVO.setSubject(tStudyAnswer.getSubject() + "," + tStudyAnswer.getAnswerSubject());
answerVOS.add(studyAnswerVO);
}
@@ -567,7 +568,7 @@
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
StudyPairVO studyPairVO = new StudyPairVO();
- if (StringUtils.hasLength(tStudyPair.getSubject())){
+ if (StringUtils.hasLength(tStudyPair.getSubject())) {
for (String s : tStudyPair.getSubject().split(",")) {
TSubject byId = subjectService.getById(s);
names.append(byId.getName()).append(",");
@@ -603,38 +604,41 @@
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
StringBuilder sort1 = new StringBuilder();
- if (StringUtils.hasLength(tStory.getStory())){
+ if (StringUtils.hasLength(tStory.getStory())) {
for (String s : tStory.getStory().split(",")) {
TStory byId = storyService.getById(s);
names.append(byId.getName()).append(",");
}
}
- if (StringUtils.hasLength(tStory.getLookStory())){
+ if (StringUtils.hasLength(tStory.getLookStory())) {
for (String s : tStory.getLookStory().split(",")) {
TStory byId = storyService.getById(s);
names1.append(byId.getName()).append(",");
}
}
- if (StringUtils.hasLength(tStory.getSort())){
+ if (StringUtils.hasLength(tStory.getSort())) {
for (String s : tStory.getSort().split(",")) {
sort.append(s).append(",");
}
}
- if (StringUtils.hasLength(tStory.getLookSort())){
+ if (StringUtils.hasLength(tStory.getLookSort())) {
for (String s : tStory.getLookSort().split(",")) {
sort1.append(s).append(",");
}
}
- if (StringUtils.hasLength(names)){
+ if (StringUtils.hasLength(names)) {
storyVO.setName(names.substring(0, names.length() - 1));
- }if (StringUtils.hasLength(sort)){
+ }
+ if (StringUtils.hasLength(sort)) {
storyVO.setSort(sort.substring(0, sort.length() - 1));
- }if (StringUtils.hasLength(names1)){
+ }
+ if (StringUtils.hasLength(names1)) {
storyVO.setLookName(names1.substring(0, names1.length() - 1));
- }if (StringUtils.hasLength(sort1)){
+ }
+ if (StringUtils.hasLength(sort1)) {
storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
}
storyVO.setIntegral(tStory.getIntegral());
@@ -658,7 +662,7 @@
* @param quarter 季度
*/
@GetMapping("/weekList")
- @ApiOperation(value = "周目列表", tags = {"周目列表"})
+ @ApiOperation(value = "根据季度获取周目列表", tags = {"根据季度获取周目列表"})
@ApiImplicitParams({
@ApiImplicitParam(value = "所属类型", name = "type", dataType = "Integer", required = true),
@ApiImplicitParam(value = "季度", name = "quarter", dataType = "Integer", required = true)
@@ -854,7 +858,7 @@
* @param completeStudy 完成学习信息
*/
@PostMapping("/completeLearning")
- @ApiOperation(value = "完成学习", tags = {"完成学习/其他积分来源(分享...)"})
+ @ApiOperation(value = "完成学习", tags = {"完成学习"})
public R<Boolean> completeLearning(@RequestBody CompleteStudyDTO completeStudy) {
// 登录用户id
Integer userId = tokenService.getLoginUserStudy().getUserid();
@@ -1004,6 +1008,7 @@
subjectId.addAll(Arrays.asList(subject.split(",")));
}
redisService.setCacheList(RedisConstants.HEARING_TREE, subjectId);
+ redisService.expire(RedisConstants.HEARING_TREE, RedisConstants.THIRTY, TimeUnit.MINUTES);
}
return subjectId;
}
--
Gitblit v1.7.1