|
|
@@ -11,12 +11,14 @@ import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
+import org.springframework.web.multipart.MultipartFile;
|
|
|
+
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
|
- * 前端控制器
|
|
|
+ * 前端控制器
|
|
|
* </p>
|
|
|
*
|
|
|
* @author 吴涛涛
|
|
|
@@ -32,20 +34,22 @@ public class UserController {
|
|
|
/**
|
|
|
* 注册
|
|
|
* 参数:phone 账号 password 密码 name 姓名
|
|
|
- * code 验证码
|
|
|
+ * code 验证码
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "注册", notes = "注册方法")
|
|
|
@RequestMapping("/regist")
|
|
|
@ResponseBody
|
|
|
- public HttpRespMsg regist(User user,@RequestParam(required = false) String code) {
|
|
|
- HttpRespMsg msg = userService.regist(user,code);
|
|
|
+ public HttpRespMsg regist(User user, @RequestParam(required = false) String code) {
|
|
|
+ HttpRespMsg msg = userService.regist(user, code);
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 登录
|
|
|
* 参数:phone 账号 password 密码
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "登录", notes = "登录方法")
|
|
|
@@ -53,13 +57,14 @@ public class UserController {
|
|
|
@ResponseBody
|
|
|
public HttpRespMsg sysLogin(User user, HttpServletRequest request,
|
|
|
HttpServletResponse response) {
|
|
|
- HttpRespMsg msg = userService.login(user,request);
|
|
|
+ HttpRespMsg msg = userService.login(user, request);
|
|
|
return msg;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 用户列表
|
|
|
* 参数:deptId 部门id ,roleId 角色id,isPass 审核是否通过 0-未通过 1-通过(以上参数查什么传什么)
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "用户列表", notes = "用户列表方法")
|
|
|
@@ -73,14 +78,30 @@ public class UserController {
|
|
|
/**
|
|
|
* 用户修改/审核接口
|
|
|
* 参数:id:用户id(必传)
|
|
|
- * 要修改的参数:isPass 审核 0-不通过 1-通过,roleId修改角色,deptId 部门id ,phone 修改手机号
|
|
|
+ * 要修改的参数:isPass 审核 0-不通过 1-通过,roleId修改角色,deptId 部门id ,phone 修改手机号,file 头像文件
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "用户修改", notes = "用户修改方法")
|
|
|
@RequestMapping("/update")
|
|
|
@ResponseBody
|
|
|
- public HttpRespMsg update(User user) {
|
|
|
- HttpRespMsg msg = userService.updateUser(user);
|
|
|
+ public HttpRespMsg update(User user, @RequestParam(required = false) MultipartFile file) {
|
|
|
+ HttpRespMsg msg = userService.updateUser(user,file);
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 忘记密码/修改密码接口
|
|
|
+ * 参数:id:用户id(必传)password:密码,type :0-修改密码 1-忘记密码
|
|
|
+ * type = 1 需要传手机号 phone:手机号,code:验证码
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "忘记密码/修改密码接口", notes = "忘记密码/修改密码接口方法")
|
|
|
+ @RequestMapping("/updateAndForgetPwd")
|
|
|
+ @ResponseBody
|
|
|
+ public HttpRespMsg updateAndForgetPwd(User user, Integer type, @RequestParam(required = false) String code) {
|
|
|
+ HttpRespMsg msg = userService.updateAndForgetPwd(user, type, code);
|
|
|
return msg;
|
|
|
}
|
|
|
|