lbqms.git - Gitblit

			@@ -3,12 +3,15 @@
			import cn.dev33.satoken.secure.BCrypt;
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.io.FileUtil;
			import lombok.RequiredArgsConstructor;
			import org.dromara.common.core.domain.R;
			import org.dromara.common.core.utils.StringUtils;
			import org.dromara.common.core.utils.file.MimeTypeUtils;
			import org.dromara.common.encrypt.annotation.ApiEncrypt;
			import org.dromara.common.idempotent.annotation.RepeatSubmit;
			import org.dromara.common.log.annotation.Log;
			import org.dromara.common.log.enums.BusinessType;
			import org.dromara.common.mybatis.helper.DataPermissionHelper;
			import org.dromara.common.satoken.utils.LoginHelper;
			import org.dromara.common.web.core.BaseController;
			import org.dromara.system.domain.bo.SysUserBo;
			@@ -19,9 +22,7 @@
			import org.dromara.system.domain.vo.SysOssVo;
			import org.dromara.system.domain.vo.SysUserVo;
			import org.dromara.system.service.ISysOssService;
			import org.dromara.system.service.ISysRoleService;
			import org.dromara.system.service.ISysUserService;
			import lombok.RequiredArgsConstructor;
			import org.springframework.http.MediaType;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;
			@@ -41,7 +42,6 @@
			public class SysProfileController extends BaseController {

			private final ISysUserService userService;
			private final ISysRoleService roleService;
			private final ISysOssService ossService;

			/**
			@@ -50,7 +50,6 @@
			@GetMapping
			public R<ProfileVo> profile() {
			SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
			user.setRoles(roleService.selectRolesByUserId(user.getUserId()));
			ProfileVo profileVo = new ProfileVo();
			profileVo.setUser(user);
			profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
			@@ -59,12 +58,14 @@
			}

			/**
			* 修改用户
			* 修改用户信息
			*/
			@RepeatSubmit
			@Log(title = "个人信息", businessType = BusinessType.UPDATE)
			@PutMapping
			public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
			public R<Void> updateProfile(@Validated @RequestBody SysUserProfileBo profile) {
			SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
			user.setUserId(LoginHelper.getUserId());
			String username = LoginHelper.getUsername();
			if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
			return R.fail("修改用户'" + username + "'失败，手机号码已存在");
			@@ -72,8 +73,8 @@
			if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
			return R.fail("修改用户'" + username + "'失败，邮箱账号已存在");
			}
			user.setUserId(LoginHelper.getUserId());
			if (userService.updateUserProfile(user) > 0) {
			int rows = DataPermissionHelper.ignore(() -> userService.updateUserProfile(user));
			if (rows > 0) {
			return R.ok();
			}
			return R.fail("修改个人信息异常，请联系管理员");
			@@ -84,6 +85,7 @@
			*
			* @param bo 新旧密码
			*/
			@RepeatSubmit
			@ApiEncrypt
			@Log(title = "个人信息", businessType = BusinessType.UPDATE)
			@PutMapping("/updatePwd")
			@@ -108,6 +110,7 @@
			*
			* @param avatarfile 用户头像
			*/
			@RepeatSubmit
			@Log(title = "用户头像", businessType = BusinessType.UPDATE)
			@PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
			public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {