From a623f1eb91b1d89872e3582b5747e9d7096ea225 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 五月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 216 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 135 insertions(+), 81 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 a8feebe..9ec5522 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
@@ -177,6 +177,9 @@
TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
.eq("week", week)
.eq("type", type));
+ one.setQuarter(dto.getQuarter());
+ one.setTitle(dto.getTitle());
+ studyService.updateById(one);
GameDTO game = dto.getGame();
StoryListenDTO storyListen = dto.getStoryListen();
if (day == 6) {
@@ -336,12 +339,23 @@
*/
@PostMapping("/addWeek")
public R<Object> addWeek(@RequestBody AddWeekDTO dto) {
- TStudy tStudy = new TStudy();
- tStudy.setType(dto.getType());
- tStudy.setWeek(dto.getWeek());
- tStudy.setTitle(dto.getTitle());
- tStudy.setQuarter(dto.getQuarter());
- studyService.save(tStudy);
+ TStudy one = studyService.getOne(new QueryWrapper<TStudy>()
+ .eq("week", dto.getWeek())
+ .eq("type", dto.getType()));
+ if (one!=null){
+ one.setType(dto.getType());
+ one.setWeek(dto.getWeek());
+ one.setTitle(dto.getTitle());
+ one.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(one);
+ }else{
+ TStudy tStudy = new TStudy();
+ tStudy.setType(dto.getType());
+ tStudy.setWeek(dto.getWeek());
+ tStudy.setTitle(dto.getTitle());
+ tStudy.setQuarter(dto.getQuarter());
+ studyService.saveOrUpdate(tStudy);
+ }
return R.ok();
}
@@ -437,16 +451,19 @@
for (TStudyListen tStudyListen : list) {
StringBuilder temp = new StringBuilder();
StudyListenVO studyListenVO = new StudyListenVO();
- for (String s : tStudyListen.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- temp.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyListen.getSubject())){
+ for (String s : tStudyListen.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ temp.append(byId.getName()).append(",");
+ }
+ String string = temp.toString();
+ studyListenVO.setName(string.substring(0, string.length() - 1));
+ studyListenVO.setIntegral(tStudyListen.getIntegral());
+ studyListenVO.setSubject(tStudyListen.getSubject());
+ studyListenVO.setIsVip(tStudyListen.getIsVip());
+ listenVOS.add(studyListenVO);
}
- String string = temp.toString();
- studyListenVO.setName(string.substring(0, string.length() - 1));
- studyListenVO.setIntegral(tStudyListen.getIntegral());
- studyListenVO.setSubject(tStudyListen.getSubject());
- studyListenVO.setIsVip(tStudyListen.getIsVip());
- listenVOS.add(studyListenVO);
+
}
// 看音选图
List<TStudyLook> list1 = studyLookService.list(new QueryWrapper<TStudyLook>()
@@ -458,22 +475,25 @@
StringBuilder names = new StringBuilder();
StringBuilder sorts = new StringBuilder();
StudyLookVO studyLookVO1 = new StudyLookVO();
- for (String s : tStudyLook.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
- String[] split = tStudyLook.getSort().split(",");
- String s1 = split[index];
- sorts.append(s1).append(",");
- index++;
+ if (StringUtils.hasLength(tStudyLook.getSubject())){
+ for (String s : tStudyLook.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ String[] split = tStudyLook.getSort().split(",");
+ String s1 = split[index];
+ sorts.append(s1).append(",");
+ index++;
+ }
+ String string = names.toString();
+ String string1 = sorts.toString();
+ studyLookVO1.setName(string.substring(0, string.length() - 1));
+ studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
+ studyLookVO1.setIntegral(tStudyLook.getIntegral());
+ studyLookVO1.setSubject(tStudyLook.getSubject());
+ studyLookVO1.setIsVip(tStudyLook.getIsVip());
+ lookVOS.add(studyLookVO1);
}
- String string = names.toString();
- String string1 = sorts.toString();
- studyLookVO1.setName(string.substring(0, string.length() - 1));
- studyLookVO1.setSort(string1.substring(0, string1.length() - 1));
- studyLookVO1.setIntegral(tStudyLook.getIntegral());
- studyLookVO1.setSubject(tStudyLook.getSubject());
- studyLookVO1.setIsVip(tStudyLook.getIsVip());
- lookVOS.add(studyLookVO1);
+
}
// 归纳排除
List<TStudyInduction> list2 = studyInductionService.list(new QueryWrapper<TStudyInduction>()
@@ -483,17 +503,20 @@
for (TStudyInduction tStudyInduction : list2) {
StringBuilder names = new StringBuilder();
StudyInductionVO studyInductionVO = new StudyInductionVO();
- for (String s : tStudyInduction.getSubject().split(",")) {
- String replace = s.replace("-", "");
- TSubject byId = subjectService.getById(replace);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyInduction.getSubject())){
+ for (String s : tStudyInduction.getSubject().split(",")) {
+ String replace = s.replace("-", "");
+ TSubject byId = subjectService.getById(replace);
+ names.append(byId.getName()).append(",");
+ }
+ String string = names.toString();
+ studyInductionVO.setName(string.substring(0, string.length() - 1));
+ studyInductionVO.setIntegral(tStudyInduction.getIntegral());
+ studyInductionVO.setSubject(tStudyInduction.getSubject());
+ studyInductionVO.setIsVip(tStudyInduction.getIsVip());
+ inductionVOS.add(studyInductionVO);
}
- String string = names.toString();
- studyInductionVO.setName(string.substring(0, string.length() - 1));
- studyInductionVO.setIntegral(tStudyInduction.getIntegral());
- studyInductionVO.setSubject(tStudyInduction.getSubject());
- studyInductionVO.setIsVip(tStudyInduction.getIsVip());
- inductionVOS.add(studyInductionVO);
+
}
// 有问有答
List<TStudyAnswer> list3 = studyAnswerService.list(new QueryWrapper<TStudyAnswer>()
@@ -502,24 +525,37 @@
for (TStudyAnswer tStudyAnswer : list3) {
StringBuilder names = new StringBuilder();
StudyAnswerVO studyAnswerVO = new StudyAnswerVO();
- if (tStudyAnswer.getIsAnswer() == 1) {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
- } else {
- TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
- names.append(byId.getName()).append(",");
- TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
- names.append(byId1.getName()).append(",");
+ if (tStudyAnswer.getIsAnswer() != null){
+ if (tStudyAnswer.getIsAnswer() == 1) {
+ if (tStudyAnswer.getSubject()!=null){
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject()!=null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ } else {
+ if (tStudyAnswer.getSubject()!=null) {
+ TSubject byId = subjectService.getById(tStudyAnswer.getSubject());
+ names.append(byId.getName()).append(",");
+ }
+ if (tStudyAnswer.getAnswerSubject()!=null) {
+ TSubject byId1 = subjectService.getById(tStudyAnswer.getAnswerSubject());
+ names.append(byId1.getName()).append(",");
+ }
+ }
}
- 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());
- answerVOS.add(studyAnswerVO);
+ 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());
+ answerVOS.add(studyAnswerVO);
+ }
+
}
// 音图相配
List<TStudyPair> list4 = studyPairService.list(new QueryWrapper<TStudyPair>()
@@ -529,16 +565,19 @@
for (TStudyPair tStudyPair : list4) {
StringBuilder names = new StringBuilder();
StudyPairVO studyPairVO = new StudyPairVO();
- for (String s : tStudyPair.getSubject().split(",")) {
- TSubject byId = subjectService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStudyPair.getSubject())){
+ for (String s : tStudyPair.getSubject().split(",")) {
+ TSubject byId = subjectService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
+ String string = names.toString();
+ studyPairVO.setName(string.substring(0, string.length() - 1));
+ studyPairVO.setIntegral(tStudyPair.getIntegral());
+ studyPairVO.setSubject(tStudyPair.getSubject());
+ studyPairVO.setIsVip(tStudyPair.getIsVip());
+ pairVOS.add(studyPairVO);
}
- String string = names.toString();
- studyPairVO.setName(string.substring(0, string.length() - 1));
- studyPairVO.setIntegral(tStudyPair.getIntegral());
- studyPairVO.setSubject(tStudyPair.getSubject());
- studyPairVO.setIsVip(tStudyPair.getIsVip());
- pairVOS.add(studyPairVO);
+
}
List<TGame> list5 = gameService.list(new QueryWrapper<TGame>()
.eq("week", week));
@@ -562,29 +601,44 @@
StringBuilder names1 = new StringBuilder();
StringBuilder sort = new StringBuilder();
StringBuilder sort1 = new StringBuilder();
- for (String s : tStory.getStory().split(",")) {
- TStory byId = storyService.getById(s);
- names.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getStory())){
+ for (String s : tStory.getStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getLookStory().split(",")) {
- TStory byId = storyService.getById(s);
- names1.append(byId.getName()).append(",");
+ if (StringUtils.hasLength(tStory.getLookStory())){
+ for (String s : tStory.getLookStory().split(",")) {
+ TStory byId = storyService.getById(s);
+ names1.append(byId.getName()).append(",");
+ }
}
- for (String s : tStory.getSort().split(",")) {
- sort.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getSort())){
+ for (String s : tStory.getSort().split(",")) {
+ sort.append(s).append(",");
+ }
}
- for (String s : tStory.getLookSort().split(",")) {
- sort1.append(s).append(",");
+ if (StringUtils.hasLength(tStory.getLookSort())){
+ for (String s : tStory.getLookSort().split(",")) {
+ sort1.append(s).append(",");
+ }
}
- storyVO.setName(names.substring(0, names.length() - 1));
- storyVO.setSort(sort.substring(0, sort.length() - 1));
+ if (StringUtils.hasLength(names)){
+ storyVO.setName(names.substring(0, names.length() - 1));
+
+ }if (StringUtils.hasLength(sort)){
+ storyVO.setSort(sort.substring(0, sort.length() - 1));
+
+ }if (StringUtils.hasLength(names1)){
+ storyVO.setLookName(names1.substring(0, names1.length() - 1));
+
+ }if (StringUtils.hasLength(sort1)){
+ storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
+ }
storyVO.setIntegral(tStory.getIntegral());
- storyVO.setLookName(names1.substring(0, names1.length() - 1));
- storyVO.setLookSort(sort1.substring(0, sort1.length() - 1));
storyVO.setLookIntegral(tStory.getLookIntegral());
storyVOS.add(storyVO);
}
-
res.setAnswer(answerVOS);
res.setPair(pairVOS);
res.setListen(listenVOS);
--
Gitblit v1.7.1