From aa7bcbc678a671a51a87c7ba6bbfaa107399a96d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 四月 2025 14:28:16 +0800
Subject: [PATCH] 添加优化原片出库报表，除去时间相关筛选
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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 5255581..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,12 +6,14 @@
import com.example.erp.common.Result;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.service.userInfo.UserService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
@@ -22,28 +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
- @PostMapping("/userAdd")
+ @ApiOperation("鑾峰彇鐢ㄦ埛token")
+ @PostMapping("/getTokenInfo")
public Result userAdd() {
return Result.seccess(StpUtil.getTokenInfo());
}
- @PostMapping("/userDelete")
- @SaCheckPermission("user.delete")
- 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());
+ }
+
+ @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