From 8eb03554c07de7e268cf230249caf10922c6b47d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 17:18:53 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 5858e80..8417f23 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -5,16 +5,18 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
-import com.matrix.system.app.dto.BeauticianDto;
-import com.matrix.system.app.dto.UsersQueryDto;
+import com.matrix.system.app.dto.*;
import com.matrix.system.app.mapper.SysBeauticianStateMapper;
import com.matrix.system.app.mapper.SysUsersMapper;
import com.matrix.system.app.mapper.SysWorkBeatuistaffMapper;
import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.app.vo.UserAchieveVo;
+import com.matrix.system.app.vo.UserInfoDetailVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.common.tools.PasswordUtil;
+import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysWorkBeatuistaff;
import com.matrix.system.hive.service.AchieveNewService;
@@ -29,6 +31,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +43,7 @@
@Api(value = "ApiUsersAction", tags = "用户中心接口类")
@RestController
@RequestMapping(value = "/api/user")
-public class ApiUsersAction {
+public class ApiUsersAction extends BaseController {
@Autowired
private AchieveNewService achieveNewService;
@@ -127,4 +131,51 @@
return AjaxResult.buildSuccessInstance(dataList);
}
+ @ApiOperation(value = "修改密码", notes = "修改密码")
+ @PostMapping(value = "/modifyPwd")
+ public AjaxResult modifyPwd(@RequestBody @Validated PwdModifyDto pwdModifyDto) throws UnsupportedEncodingException, NoSuchAlgorithmException {
+ SysUsers me = getMe();
+ SysUsers user = sysUsersService.findById(me.getSuId());
+
+ SysUsers pwdUser = new SysUsers();
+ pwdUser.setSuPassword(pwdModifyDto.getOldPwd());
+ pwdUser.setSuRegisterTime(user.getSuRegisterTime());
+ String pwd = PasswordUtil.getEncrypUserPwd(pwdUser);
+ if (!pwd.equals(user.getSuPassword())) {
+ return AjaxResult.buildFailInstance("老密码错误");
+ }
+
+ int i = sysUsersService.updateUserPassword(user.getSuId(), pwd);
+ if (i > 0) {
+ return AjaxResult.buildSuccessInstance("修改成功");
+ }
+ return AjaxResult.buildFailInstance("修改失败");
+
+ }
+
+ @ApiOperation(value = "获取当前登陆用户信息", notes = "获取当前登陆用户信息")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = UserInfoDetailVo.class)
+ })
+ @GetMapping(value = "/findUserInfo")
+ public AjaxResult findUserInfo() {
+ SysUsers user = getMe();
+ UserInfoDetailVo userInfoDetailVo = SysUsersMapper.INSTANCE.usersToDetailInfoVo(user);
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
+ ajaxResult.putInMap("detail", userInfoDetailVo);
+ return ajaxResult;
+ }
+
+ @ApiOperation(value = "编辑当前用户信息", notes = "编辑当前用户信息")
+ @PostMapping(value = "/modifyUserInfo")
+ public AjaxResult modifyUserInfo(@RequestBody @Validated ModifyUserDto modifyUserDto) {
+ SysUsers user = SysUsersMapper.INSTANCE.modifyUserDtoToUsers(modifyUserDto);
+ user.setSuId(getMe().getSuId());
+ int i = sysUsersService.modifyByModel(user);
+ if (i > 0) {
+ return AjaxResult.buildSuccessInstance("修改成功");
+ }
+ return AjaxResult.buildFailInstance("修改失败");
+ }
+
}
--
Gitblit v1.9.1