From c832cae4de3ff53e3b80cad317fbdd84de46c02d Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 19 七月 2024 09:31:34 +0800
Subject: [PATCH] fix: 学习端bug
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStoryController.java | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 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 2ba4946..87356f6 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
@@ -29,29 +29,11 @@
@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;
@PostMapping("/storyList")
- @ApiOperation(value = "列表查询", tags = {"故事管理"})
+// @ApiOperation(value = "列表查询", tags = {"故事管理"})
public R<PageInfo<SubjectVO>> storyList(@RequestBody SubjectQuery query) {
PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<SubjectVO> list = service.listAll(query);
@@ -76,7 +58,7 @@
return R.ok(res);
}
@PostMapping("/add")
- @ApiOperation(value = "添加", tags = {"故事管理"})
+// @ApiOperation(value = "添加", tags = {"故事管理"})
public R add(@RequestBody StoryDTO dto) {
TStory tSubject = new TStory();
BeanUtils.copyProperties(dto,tSubject);
@@ -84,17 +66,17 @@
return R.ok("添加成功");
}
@PostMapping("/update")
- @ApiOperation(value = "编辑", tags = {"故事管理"})
+// @ApiOperation(value = "编辑", tags = {"故事管理"})
public R update(@RequestBody StoryDTO dto) {
TStory tSubject = new TStory();
- R<Object> week = getObjectR(dto.getId());
- if (week != null) return week;
+// R<Object> week = getObjectR(dto.getId());
+// if (week != null) return week;
BeanUtils.copyProperties(dto,tSubject);
service.updateById(tSubject);
return R.ok("编辑成功");
}
@PostMapping("/getInfo")
- @ApiOperation(value = "查看详情", tags = {"故事管理"})
+// @ApiOperation(value = "查看详情", tags = {"故事管理"})
public R<StoryDTO> getInfo1(@RequestParam("id") Integer id) {
TStory byId = service.getById(id);
StoryDTO subjectDTO = new StoryDTO();
@@ -102,7 +84,7 @@
return R.ok(subjectDTO);
}
@PostMapping("/updateState/{id}/{state}")
- @ApiOperation(value = "修改状态", tags = {"故事管理"})
+// @ApiOperation(value = "修改状态", tags = {"故事管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "题目id", required = true),
@ApiImplicitParam(name = "state", value = "1上架2下架3删除", required = true),
@@ -135,13 +117,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