From 75942ecc2e438012c5ea876715966ace593565a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 15:17:41 +0800
Subject: [PATCH] 部分代码
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
index 3a4bb80..d01e63b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java
@@ -13,9 +13,12 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -29,33 +32,46 @@
@RequestMapping("/base/tStory")
public class TStoryController {
@Autowired
- private ITStudyAnswerService studyAnswerService;
- @Autowired
- private ITStudyInductionService studyInductionService;
- @Autowired
- private ITStudyLookService studyLookService;
- @Autowired
- private ITStudyListenService studyListenService;
- @Autowired
- private ITStudyPairService studyPairService;
- @Autowired
- private ITGameService gameService;
- @Autowired
private ITStoryListenService storyListenService;
@Autowired
- private ITSubjectService subjectService;
- @Autowired
- private ITStoryService storyService;
- @Autowired
- private ITStudyService studyService;
- @Autowired
private ITStoryService service;
+
+ @Autowired
+ private ICategoryService categoryService;
@PostMapping("/storyList")
-// @ApiOperation(value = "列表查询", tags = {"故事管理"})
public R<PageInfo<SubjectVO>> storyList(@RequestBody SubjectQuery query) {
PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
+ List<Integer> integers = new ArrayList<>();
+ if (StringUtils.hasLength(query.getCategoryName())){
+ List<Integer> collect = categoryService.lambdaQuery()
+ .eq(TCategory::getType, 2)
+ .eq(TCategory::getState, 2)
+ .like(TCategory::getName, query.getCategoryName())
+ .list().stream().map(TCategory::getParentId).collect(Collectors.toList());
+ integers.addAll(collect);
+ List<Integer> collect2 = categoryService.lambdaQuery()
+ .eq(TCategory::getType, 1)
+ .eq(TCategory::getState, 2)
+ .like(TCategory::getName, query.getCategoryName())
+ .list().stream().map(TCategory::getId).collect(Collectors.toList());
+ integers.addAll(collect2);
+ }
+ if (StringUtils.hasLength(query.getCategoryName())){
+ if (integers.isEmpty()){
+ integers.add(-1);
+ }
+ }
+
+ query.setIds(integers);
List<SubjectVO> list = service.listAll(query);
-// for (SubjectVO subjectVO : list) {
+ for (SubjectVO subjectVO : list) {
+ if (subjectVO.getFirstCategory()!=null&&subjectVO.getSecondCategory()!=null){
+ TCategory byId1 = categoryService.getById(subjectVO.getFirstCategory());
+ TCategory byId2 = categoryService.getById(subjectVO.getSecondCategory());
+ if (byId1!=null&& byId2!=null){
+ subjectVO.setCategoryName(byId1.getName()+"-"+byId2.getName());
+ }
+ }
// StringBuilder stringBuilder = new StringBuilder("");
// for (String s : subjectVO.getType().split(",")) {
// switch (s) {
@@ -70,7 +86,7 @@
// String string = stringBuilder.toString();
// String substring = string.substring(0, string.length() - 1);
// subjectVO.setType(substring);
-// }
+ }
res.setRecords(list);
res.setTotal(list.size());
return R.ok(res);
@@ -135,13 +151,13 @@
for (String s : split) {
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "听故事" + "、" + "框架记忆中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "听故事" + "、" + "框架记忆中使用");
}
}
for (String s : split1) {
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "听故事" + "、" + "看图配音中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "听故事" + "、" + "看图配音中使用");
}
}
}
--
Gitblit v1.7.1