From 025ce634be776644180b7f1f361b5533a063a230 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 07 五月 2024 21:37:25 +0800
Subject: [PATCH] fixbug:代码被后续提交覆盖代码恢复 移除maven工具包 新增定时任务 忽略日志文件 新增日志输入 Merge branch 'security 20240424' 权限管理开发基本功能已完成,待前端对接
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 326e4d0..2e0f357 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -1,11 +1,23 @@
package com.mes.userinfo.controller;
+import com.mes.entity.request.GeneralRequest;
import com.mes.userinfo.entity.SysUser;
+import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.service.SysUserService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+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 java.util.List;
+import java.util.Map;
/**
* <p>
@@ -15,21 +27,64 @@
* @author zhoush
* @since 2024-04-11
*/
+@Api(description = "鐢ㄦ埛绠＄悊")
@RestController
-@RequestMapping("/userinfo")
+@RequestMapping("/sys/user")
public class SysUserController {
@Autowired
private SysUserService sysUserService;
+ @ApiOperation("鐢ㄦ埛鐧诲綍")
@PostMapping("/login")
- public Result login(@RequestBody SysUser user) {
- return sysUserService.login(user);
+ public Result<Map<String, String>> login(@RequestBody SysUser user) {
+ return Result.success(sysUserService.login(user));
}
- @GetMapping("/hello")
- public Result hello() {
- return Result.success("eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJlZjMyMjQ4NDcyODE0ZWFlYWRlOTBkYmZjYWFlZmNmZSIsInN1YiI6IjEiLCJpc3MiOiJzZyIsImlhdCI6MTcxMjkwMjI0NCwiZXhwIjoxNzEyOTA1ODQ0fQ.DlJkhkiwjZSqprdLzKaTB3yuyxGukerKeF0FbJK_6HY");
+ @ApiOperation("閫�鍑虹櫥褰�")
+ @PostMapping("/logout")
+// @PreAuthorize("hasRole('ROLE_admin')")
+ @PreAuthorize("hasAuthority('xt:yh')")
+ public Result<String> logout() {
+ return Result.success(sysUserService.logout());
}
+
+ @ApiOperation("鏂板鐢ㄦ埛淇℃伅")
+ @PostMapping("/saveUser")
+// @PreAuthorize("hasAuthority('sys:user:save')")
+ public Result<String> saveUser(@Validated @RequestBody SysUserVO sysUser) {
+ return Result.success(sysUserService.saveUser(sysUser));
+ }
+
+
+ @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
+ @PostMapping("/updateUser")
+// @PreAuthorize("hasAuthority('sys:user:update')")
+ public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
+ return Result.success(sysUserService.updateUser(sysUser));
+ }
+
+ @ApiOperation("閲嶇疆瀵嗙爜")
+ @PostMapping("/resetPassword")
+// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
+ public Result resetPassword(String userId) {
+ return Result.success(sysUserService.resetPassword(Long.parseLong(userId)));
+ }
+
+
+ @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
+ @PostMapping("/listByUserName")
+// @PreAuthorize("hasAuthority('sys:user:list')")
+ public Result<List<SysUserVO>> listByUserName(@RequestBody GeneralRequest request) {
+ return Result.success(sysUserService.listByUserName(request));
+ }
+
+ @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
+ @PostMapping("/deleteUser")
+// @PreAuthorize("hasAuthority('sys:user:delete')")
+ public Result<String> deleteUser(@RequestBody List<Long> ids) {
+ return Result.success(sysUserService.deleteUser(ids));
+ }
+
}
--
Gitblit v1.8.0