~admin/HangZhouMes.git

			@@ -1,13 +1,15 @@
			package com.mes.userinfo.controller;


			import com.mes.base.BaseController;
			import com.mes.entity.request.GeneralRequest;
			import com.mes.userinfo.entity.SysUser;
			import com.mes.userinfo.entity.request.UserRequest;
			import com.mes.userinfo.entity.vo.SysUserVO;
			import com.mes.userinfo.service.SysUserService;
			import com.mes.utils.Result;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			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;
			@@ -25,10 +27,13 @@
			* @author zhoush
			* @since 2024-04-11
			*/
			@ApiModel("用户信息")
			@Api(description = "用户管理")
			@RestController
			@RequestMapping("/userinfo")
			public class SysUserController extends BaseController {
			@RequestMapping("/sys/user")
			public class SysUserController {

			@Autowired
			private SysUserService sysUserService;

			@ApiOperation("用户登录")
			@PostMapping("/login")
			@@ -38,6 +43,8 @@

			@ApiOperation("退出登录")
			@PostMapping("/logout")
			// @PreAuthorize("hasRole('ROLE_admin')")
			@PreAuthorize("hasAuthority('xt:yh')")
			public Result<String> logout() {
			return Result.success(sysUserService.logout());
			}
			@@ -57,17 +64,18 @@
			return Result.success(sysUserService.updateUser(sysUser));
			}

			@ApiOperation("重置密码")
			@PostMapping("/resetPassword")
			// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
			public Result resetPassword(@RequestBody Long userId) {
			return Result.success(sysUserService.resetPassword(userId));
			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 UserRequest request) {
			public Result<List<SysUserVO>> listByUserName(@RequestBody GeneralRequest request) {
			return Result.success(sysUserService.listByUserName(request));
			}