From 000b6d0b06b5777bbe252559396b7f2fadca3adc Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:36:28 +0800
Subject: [PATCH] 职称key先给了个固定值，计划用汉字转拼音转换一下
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index 5408c51..dc15918 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -15,6 +15,7 @@
import com.kidgrow.usercenter.model.SysUserExcel;
import com.kidgrow.usercenter.model.SysUserLogs;
import com.kidgrow.usercenter.service.ISysUserService;
+import com.kidgrow.usercenter.vo.UserRegVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -224,7 +225,7 @@
/**
* 管理后台，给用户重置密码
- *
+ *重置密码后，会将新密码返回到data字段。
* @param id
*/
@PutMapping(value = "/users/{id}/password")
@@ -233,8 +234,7 @@
if (checkAdmin(id)) {
return ResultBody.failed(ADMIN_CHANGE_MSG);
}
- appUserService.updatePassword(id, null, null);
- return ResultBody.ok().msg("重置成功");
+ return appUserService.updatePassword(id, null, null,true);
}
/**
@@ -245,10 +245,43 @@
if (checkAdmin(sysUser.getId())) {
return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
}
- appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword());
- return ResultBody.ok().msg("重置成功");
+ appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(),false);
+ return ResultBody.ok().data(true).msg("密码重置成功");
+ }
+ /**
+ * 用户自己修改密码-后端以外
+ */
+ @PutMapping(value = "/users/resetpassword")
+ public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) {
+ Long id=MapUtils.getLong(params, "id");
+ String oldPassword=MapUtils.getString(params,"oldPassword");
+ String newPassword=MapUtils.getString(params,"newPassword");
+ String refPassword=MapUtils.getString(params,"refPassword");
+ if (id>0&&!oldPassword.isEmpty()&&!newPassword.isEmpty()&&!refPassword.isEmpty()) {
+ if (refPassword.equals(newPassword)) {
+ return appUserService.updatePassword(id,oldPassword,newPassword,false).data(true).msg("密码修改成功！");
+ }
+ else
+ {
+ return ResultBody.failed("两次新密码输入不一致！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("必须参数有误！").data(false);
+ }
}
+ /**
+ * 用户修改自己的手机号
+ * @param params
+ * @return
+ */
+ @PutMapping(value="/users/updateusertel")
+ public ResultBody updateUserTel(@RequestParam Map<String,Object> params)
+ {
+ return appUserService.updateUserTel(params);
+ }
/**
* 删除用户
*
@@ -261,7 +294,7 @@
return ResultBody.failed(ADMIN_CHANGE_MSG);
}
appUserService.delUser(id);
- return ResultBody.ok().msg("删除成功");
+ return ResultBody.ok().msg("删除成功").data(true);
}
@@ -276,6 +309,12 @@
@AuditLog(operation = "'新增或更新用户:' + #sysUser.username")
public ResultBody saveOrUpdate(@RequestBody SysUser sysUser) {
return appUserService.saveOrUpdateUser(sysUser);
+ }
+
+ @PostMapping("/users/doctorUserReg")
+ @AuditLog(operation = "'注册用户:' + #userRegVo.mobile")
+ public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo) {
+ return appUserService.doctorUserReg(userRegVo);
}
/**
@@ -375,4 +414,14 @@
public ResultBody updatePhone(@RequestBody Map<String,Object> map, @LoginUser SysUser sysUser) {
return appUserService.updatePhone(map,sysUser);
}
+
+ /**
+ * 获取指定用户信息（销售人员和服务人员）
+ */
+ @GetMapping("users/getAppointUser")
+ public ResultBody getAppointUser(){
+ String type = request.getParameter("type");
+
+ return appUserService.findAppointUsers(Integer.parseInt(type));
+ }
}
--
Gitblit v1.8.0