From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
index 32fea4a..9e2efd8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java
@@ -6,9 +6,12 @@
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@RestController
+@Api(value="鐢ㄦ埛controller",tags={"鐢ㄦ埛鎿嶄綔鎺ュ彛"})
@RequestMapping("/userInfo")
public class UserInfoController {
private final UserService userService;
@@ -19,30 +22,41 @@
}
@PostMapping("/login")
+ @ApiOperation("鐢ㄦ埛鐧诲綍")
public Result login(@RequestBody UserDTO userDTO) {
return Result.seccess(userService.doLogin(userDTO));
}
+
+ @ApiOperation("鐢ㄦ埛閫�鍑�")
@PostMapping("/logout")
public Result logout() {
return Result.seccess(userService.logout());
}
+ @ApiOperation("鍒ゆ柇鐢ㄦ埛鏄惁鐧诲綍")
@PostMapping("/isLogin")
public Result isLogin() {
return Result.seccess(userService.isLogin()); }
@SaCheckLogin
+ @ApiOperation("鑾峰彇鐢ㄦ埛token")
@PostMapping("/getTokenInfo")
public Result userAdd() {
return Result.seccess(StpUtil.getTokenInfo());
}
- @PostMapping("/userDelete")
- public Result userDelete() {
- return Result.seccess(123123);
+
+ @SaCheckPermission("userList.delete")
+ @ApiOperation("鍒犻櫎鐢ㄦ埛")
+ @PostMapping("/userDelete/{id}")
+ public Result userDelete(@PathVariable Integer id) {
+ return Result.seccess(userService.userDelete(id));
}
+
+ @ApiOperation("鏌ヨ鐢ㄦ埛鍒楄〃")
+ @SaCheckPermission("userList.search")
@GetMapping("findAll")
public Result findAll(){
return Result.seccess(userService.findAll());
--
Gitblit v1.8.0