【用户信息】-【修改密码开发】-（王童）-2020/05/07

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/ModifyPwdDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description: 修改密码
+ * @author: wangtong
+ * @create: 2020-05-07 14:15
+ **/
+@Data
+public class ModifyPwdDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "原密码")
+    @NotBlank(message="{sysuser.password.require}")
+    private String oldPwd;
+
+    @ApiModelProperty(value = "新密码")
+    @NotBlank(message="{sysuser.password.require}")
+    private String newPwd;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@@ -443,7 +443,6 @@ public class SysUserController {
     * @describe: 判断是否更新头像
     * @author wangtong
     * @date 2020/3/30 13:49
-    * @param []
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping("checkUpdateAvatar")
@@ -455,7 +454,7 @@ public class SysUserController {
     * @describe: 更新头像
     * @author wangtong
     * @date 2020/3/30 16:11
-    * @param [avatar]
+    * @param avatar
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping("updateAvatar")
@@ -463,4 +462,19 @@ public class SysUserController {
         return sysUserService.updateAvatar(avatar);
     }
 
+    /**
+    * @describe: 修改密码
+    * @author wangtong
+    * @date 2020/5/7 14:56
+    * @param [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("modifyPwd")
+    @LogOperation("Password User")
+    public Result modifyPwd(@RequestBody ModifyPwdDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto);
+        return sysUserService.modifyPwd(dto);
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@@ -11,6 +11,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ModifyPwdDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
@@ -136,4 +137,13 @@ public interface SysUserService extends BaseService<SysUserEntity> {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result updateAvatar(String avatar);
+
+    /**
+    * @describe: 修改密码
+    * @author wangtong
+    * @date 2020/5/7 15:09
+    * @param [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result modifyPwd(ModifyPwdDTO dto);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -17,6 +17,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils;
@@ -25,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SysUserDao;
+import com.elink.esua.epdc.dto.ModifyPwdDTO;
 import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
 import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
@@ -282,6 +284,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         if(StringUtils.isBlank(avatar)){
             throw new RenException("头像地址不可为空");
         }
+        UserDetail user = SecurityUser.getUser();
         String userId = SecurityUser.getUser().getId().toString();
         SysUserEntity userInfo = baseDao.selectById(userId);
         userInfo.setHeadUrl(avatar);
@@ -289,5 +292,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         return new Result().ok(true);
     }
 
+    @Override
+    public Result modifyPwd(ModifyPwdDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        //原密码不正确
+        if (!PasswordUtils.matches(dto.getOldPwd(), user.getPassword())) {
+            return new Result().error(ErrorCode.PASSWORD_ERROR);
+        }
+        updatePassword(user.getId(), dto.getNewPwd());
+        return new Result().ok(true);
+    }
+
 
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ModifyPwdDTO;
+import com.elink.esua.epdc.service.SysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户管理相关接口
+ *
+ * @author wangtong
+ * @date 2020/5/7 9:44
+ */
+@RestController
+@RequestMapping("sys/user")
+public class ApiSysUserController {
+
+    @Autowired
+    private SysUserService sysUserService;
+
+
+
+    /**
+    * @describe: 修改用户密码
+    * @author wangtong
+    * @date 2020/5/7 9:44
+    * @param [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("modifyPwd")
+    public Result modifyPwd(@RequestBody ModifyPwdDTO dto) {
+        return sysUserService.modifyPwd(dto);
+    }
+
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -2,10 +2,7 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.SysUserDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
@@ -13,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -111,4 +109,14 @@ public interface AdminFeignClient {
     */
     @GetMapping(value="sys/user/updateAvatar", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result updateAvatar(@RequestParam("avatar") String avatar);
+
+    /**
+     * @describe: 修改用户密码
+     * @author wangtong
+     * @date 2020/5/7 10:04
+     * @param [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @PostMapping(value="sys/user/modifyPwd", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result modifyPwd(ModifyPwdDTO dto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.DeptOption;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.SysUserDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -61,4 +58,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result updateAvatar(String avatar) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "updateAvatar",avatar);
     }
+
+    @Override
+    public Result modifyPwd(ModifyPwdDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "modifyPwd",dto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ModifyPwdDTO;
+
+/**
+ * @author wangtong
+ * @date 2020/5/7 9:44
+ */
+public interface SysUserService {
+
+
+    /**
+    * @describe: 修改用户密码
+    * @author wangtong
+    * @date 2020/5/7 9:47
+    * @param [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result modifyPwd(ModifyPwdDTO dto);
+}

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,32 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ModifyPwdDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * @author wangtong
+ * @date 2020/5/7 9:50
+ */
+@Slf4j
+@Service
+public class SysUserServiceImpl implements SysUserService {
+    private static final Logger logger = LoggerFactory.getLogger(SysUserServiceImpl.class);
+
+
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
+
+    @Override
+    public Result modifyPwd(ModifyPwdDTO dto) {
+        return adminFeignClient.modifyPwd(dto);
+    }
+}