From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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, 29 insertions(+), 7 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 4b85ab9..842e467 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
@@ -10,6 +10,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+
@RestController
@Api(value="鐢ㄦ埛controller",tags={"鐢ㄦ埛鎿嶄綔鎺ュ彛"})
@RequestMapping("/userInfo")
@@ -24,34 +26,34 @@
@PostMapping("/login")
@ApiOperation("鐢ㄦ埛鐧诲綍")
public Result login(@RequestBody UserDTO userDTO) {
- return Result.seccess(userService.doLogin(userDTO));
+ return Result.success(userService.doLogin(userDTO));
}
@ApiOperation("鐢ㄦ埛閫�鍑�")
@PostMapping("/logout")
public Result logout() {
- return Result.seccess(userService.logout());
+ return Result.success(userService.logout());
}
@ApiOperation("鍒ゆ柇鐢ㄦ埛鏄惁鐧诲綍")
@PostMapping("/isLogin")
public Result isLogin() {
- return Result.seccess(userService.isLogin()); }
+ return Result.success(userService.isLogin()); }
@SaCheckLogin
@ApiOperation("鑾峰彇鐢ㄦ埛token")
@PostMapping("/getTokenInfo")
public Result userAdd() {
- return Result.seccess(StpUtil.getTokenInfo());
+ return Result.success(StpUtil.getTokenInfo());
}
- @SaCheckPermission("userList.search")
+ @SaCheckPermission("userList.delete")
@ApiOperation("鍒犻櫎鐢ㄦ埛")
@PostMapping("/userDelete/{id}")
public Result userDelete(@PathVariable Integer id) {
- return Result.seccess(userService.userDelete(id));
+ return Result.success(userService.userDelete(id));
}
@@ -59,6 +61,26 @@
@SaCheckPermission("userList.search")
@GetMapping("findAll")
public Result findAll(){
- return Result.seccess(userService.findAll());
+ return Result.success(userService.findAll());
+ }
+
+ @ApiOperation("app鏌ヨ鎶ュ伐鐝粍鍒楄〃")
+ @PostMapping("findByAddress")
+ public Result findByAddress(@RequestBody Map<String,String> userName){
+ return Result.success(userService.findByAddress(userName));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
+ @SaCheckPermission("userList.search")
+ @PostMapping("selectProcess")
+ public Result selectProcess(){
+ return Result.success(userService.selectProcessSv());
+ }
+
+ @ApiOperation("淇敼鐢ㄦ埛宸ュ簭")
+ @SaCheckPermission("userList.search")
+ @PostMapping("updateProcess/{id}/{process}")
+ public Result updateProcess(@PathVariable Integer id,@PathVariable String process){
+ return Result.success(userService.updateProcessSv(id,process));
}
}
--
Gitblit v1.8.0