From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 6045054..0adad18 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,14 @@
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.*;
+import java.util.Map;
+
@RestController
+@Api(value="鐢ㄦ埛controller",tags={"鐢ㄦ埛鎿嶄綔鎺ュ彛"})
@RequestMapping("/userInfo")
public class UserInfoController {
private final UserService userService;
@@ -19,32 +24,63 @@
}
@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());
}
+
+ @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());
}
+
+ @ApiOperation("app鏌ヨ鎶ュ伐鐝粍鍒楄〃")
+ @PostMapping("findByAddress")
+ public Result findByAddress(@RequestBody Map<String,String> userName){
+ return Result.seccess(userService.findByAddress(userName));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+ @SaCheckPermission("userList.search")
+ @PostMapping("selectProcess")
+ public Result selectProcess(){
+ return Result.seccess(userService.selectProcessSv());
+ }
+
+ @ApiOperation("淇敼鐢ㄦ埛宸ュ簭")
+ @SaCheckPermission("userList.search")
+ @PostMapping("updateProcess/{id}/{process}")
+ public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
+ return Result.seccess(userService.updateProcessSv(id,process));
+ }
}
--
Gitblit v1.8.0