From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
index 6af2f91..90336bf 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ClassesController.java
@@ -25,7 +25,7 @@
@RequiredArgsConstructor
@Api(value = "鐝骇", tags = "鐝骇绠＄悊")
@RestController
-@RequestMapping("/api/classes")
+@RequestMapping("/api/admin/classes")
public class ClassesController {
private final ClassesService classesService;
@@ -65,11 +65,18 @@
return classesService.page(query);
}
- @GetMapping("/dissolution/{id}")
+ @PutMapping("/dissolution/{id}")
@ApiOperation(value = "瑙ｆ暎", notes = "瑙ｆ暎")
@PreAuthorize("hasAuthority('classes:dissolution')")
public Result dissolution(@PathVariable("id") Integer id) {
return classesService.dissolution(id);
+ }
+
+ @PutMapping("/recover/{id}")
+ @ApiOperation(value = "鎭㈠姝ｅ父", notes = "鎭㈠姝ｅ父")
+ @PreAuthorize("hasAuthority('classes:recover')")
+ public Result recover(@PathVariable("id") Integer id) {
+ return classesService.recover(id);
}
@GetMapping("/{id}")
@@ -85,4 +92,11 @@
public Result list() {
return classesService.all();
}
+
+ @GetMapping("/my")
+ @PreAuthorize("hasAuthority('classes:my')")
+ @ApiOperation(value = "鎴戠殑鐝骇", notes = "鎴戠殑鐝骇")
+ public Result myClassList() {
+ return classesService.myClassList();
+ }
}
--
Gitblit v1.8.0