From 5f69a549add739b190f46ba7d035e2fe31390e01 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 17 Jul 2020 09:39:04 +0800
Subject: [PATCH] 添加修改密码的加密的功能

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 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 eb54485..aed44e1 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
@@ -86,7 +86,6 @@
     @ApiOperation(value = "根据用户名查询用户实体")
     @Cacheable(value = "user", key = "#username")
     public SysUser selectByUsername(@PathVariable String username) {
-
         return appUserService.selectByUsername(username);
     }
 
@@ -116,6 +115,7 @@
         sysUserLogs.setLoginAgentSystem(request.getHeader(CommonConstant.USER_AGENT_SYSTEM));
         sysUserLogs.setLoginAgentBrowser(request.getHeader(CommonConstant.USER_AGENT_BROWSER));
         sysUserLogs.setLoginIp(request.getHeader(CommonConstant.USER_AGENT_IP));
+        sysUserLogs.setLoginSystemScreen(request.getHeader(CommonConstant.USER_AGENT_SYSTEM_SCREEN));
         sysUserLogs.setLoginTime(new Date());
         sysUserLogs.setUserid(sysUser.getId());
         sysUserLogs.setUsername(sysUser.getUsername());
@@ -212,9 +212,9 @@
      */
     @ApiOperation(value = "用户查询列表")
     @GetMapping("/users/HDoctorusers")
-    public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId) {
+    public ResultBody hospitalDoctorList(@RequestParam Long hospitalId, Long departmentId,boolean isIncluddel) {
         if (StringUtils.isNotBlank(hospitalId.toString()) && StringUtils.isNotBlank(departmentId.toString())) {
-            return appUserService.hospitalDoctorList(hospitalId, departmentId);
+            return appUserService.hospitalDoctorList(hospitalId, departmentId,isIncluddel);
         } else {
             return ResultBody.failed("查询参数有误");
         }
@@ -248,7 +248,7 @@
      */
     @PutMapping(value = "/users/{id}/password")
     @AuditLog(operation = "'重置用户密码:' + #id")
-    public ResultBody resetPassword(@PathVariable Long id) {
+    public ResultBody resetPassword(@PathVariable Long id) throws Exception{
         if (checkAdmin(id)) {
             return ResultBody.failed(ADMIN_CHANGE_MSG);
         }
@@ -259,19 +259,19 @@
      * 用户自己修改密码
      */
     @PutMapping(value = "/users/password")
-    public ResultBody resetPassword(@RequestBody SysUser sysUser) {
+    public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
         if (checkAdmin(sysUser.getId())) {
             return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
         }
-        appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
-        return ResultBody.ok().data(true).msg("密码重置成功");
+        ResultBody resultBody = appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
+        return resultBody;
     }
 
     /**
      * 用户自己修改密码-后端以外
      */
     @PutMapping(value = "/users/resetpassword")
-    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) {
+    public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) throws Exception {
         Long id = MapUtils.getLong(params, "id");
         String oldPassword = MapUtils.getString(params, "oldPassword");
         String newPassword = MapUtils.getString(params, "newPassword");
@@ -294,7 +294,14 @@
      * @return
      */
     @PutMapping(value = "/users/updateusertel")
-    public ResultBody updateUserTel(@RequestParam Map<String, Object> params) {
+    public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) throws Exception  {
+        String oldTel = MapUtils.getString(params, "oldTel");
+        if (oldTel==null){
+            return ResultBody.failed("请输入原账号");
+        }
+        if(!sysUser.getUsername().equals(oldTel)){
+            return ResultBody.failed("请输入正确的原账号");
+        }
         return appUserService.updateUserTel(params);
     }
 
@@ -335,7 +342,7 @@
      */
     @PostMapping("/users/doctorUserReg")
     @AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile")
-    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) {
+    public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) throws Exception {
         return appUserService.doctorUserReg(userRegVo,sysUser);
     }
 
@@ -423,7 +430,7 @@
      * 通过手机修改密码
      */
     @PutMapping(value = "/users/passwordByPhone")
-    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) {
+    public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) throws Exception {
         return appUserService.passwordByPhone(map);
     }
 
@@ -452,4 +459,16 @@
 
         return appUserService.findAppointUsers(Integer.parseInt(type));
     }
+    /**
+     * 检查该手机号是否注册 false 未注册  true已经注册
+     */
+    @GetMapping("users/isRegUser")
+    public ResultBody isRegUser(String userTel) {
+
+        if(appUserService.phoneIsUsed(userTel))
+        {
+            return ResultBody.ok().data(true);
+        }
+        return ResultBody.failed().data(false);
+    }
 }

--
Gitblit v1.8.0