From 402aba359adb4b10cfa98ad7fcb424eb55641129 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:54:52 +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/TSubjectController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
index 32a9e8a..3c83d42 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TSubjectController.java
@@ -52,7 +52,7 @@
@PostMapping("/subjectList")
- @ApiOperation(value = "列表查询", tags = {"题目管理"})
+// @ApiOperation(value = "列表查询", tags = {"题目管理"})
public R<PageInfo<SubjectVO>> subjectList(@RequestBody SubjectQuery query) {
PageInfo<SubjectVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
List<SubjectVO> list = subjectService.listAll(query);
@@ -86,7 +86,7 @@
return R.ok(res);
}
@PostMapping("/add")
- @ApiOperation(value = "添加", tags = {"题目管理"})
+// @ApiOperation(value = "添加", tags = {"题目管理"})
public R add(@RequestBody SubjectDTO dto) {
TSubject tSubject = new TSubject();
BeanUtils.copyProperties(dto,tSubject);
@@ -94,12 +94,12 @@
return R.ok("添加成功");
}
@PostMapping("/update")
- @ApiOperation(value = "编辑", tags = {"题目管理"})
+// @ApiOperation(value = "编辑", tags = {"题目管理"})
public R update(@RequestBody SubjectDTO dto) {
TSubject tSubject = new TSubject();
// 判断当前题目有没有被使用
- 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);
subjectService.updateById(tSubject);
return R.ok("编辑成功");
@@ -118,7 +118,7 @@
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
Integer day = tStudyListen.getDay();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "听音选图中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "听音选图中使用");
}
}
}
@@ -130,7 +130,7 @@
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
Integer day = tStudyListen.getDay();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "看图选音中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "看图选音中使用");
}
}
}
@@ -142,7 +142,7 @@
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
Integer day = tStudyListen.getDay();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "归纳排除中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "归纳排除中使用");
}
}
}
@@ -154,7 +154,7 @@
if (subject.equals(id) || answerSubject.equals(id)) {
Integer week = tStudyListen.getWeek();
Integer day = tStudyListen.getDay();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "有问有答中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "有问有答中使用");
}
}
}
@@ -165,7 +165,7 @@
if (s.equals(String.valueOf(id))) {
Integer week = tStudyListen.getWeek();
Integer day = tStudyListen.getDay();
- return R.fail("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "音图相配中使用");
+ return R.failUpdate("操作失败,当前题目在" + "周目" + week + "、" + "day" + day + "、" + "音图相配中使用");
}
}
}
@@ -174,7 +174,7 @@
}
@PostMapping("/getInfo")
- @ApiOperation(value = "查看详情", tags = {"题目管理"})
+// @ApiOperation(value = "查看详情", tags = {"题目管理"})
public R<SubjectDTO> getInfo(@RequestParam("id") Integer id) {
TSubject byId = subjectService.getById(id);
SubjectDTO subjectDTO = new SubjectDTO();
@@ -182,7 +182,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),
--
Gitblit v1.7.1