用户密码修改

service/src/main/java/com/hzya/frame/sysnew/user/entity/SysUserEntity.java

@@ -27,6 +27,11 @@ public class SysUserEntity extends BaseEntity {
      * 登录密码
      */
     private String password;
+
+    /**
+     * 老登录密码
+     */
+    private String OldPassword;
     /**
      * 盐
      */
@@ -204,5 +209,13 @@ public class SysUserEntity extends BaseEntity {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
+
+    public String getOldPassword() {
+        return OldPassword;
+    }
+
+    public void setOldPassword(String oldPassword) {
+        OldPassword = oldPassword;
+    }
 }
 

service/src/main/java/com/hzya/frame/sysnew/user/service/ISysUserService.java

@@ -84,6 +84,14 @@ public interface ISysUserService extends IBaseService<SysUserEntity, String> {
      * @Date 2:37 下午 2024/3/27
      **/
     JsonResultEntity resetPassword(JSONObject jsonObject);
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 用户重置密码
+     * @Date 2:37 下午 2024/3/27
+     **/
+    JsonResultEntity userResetPassword(JSONObject jsonObject);
 
 
     /**

service/src/main/java/com/hzya/frame/sysnew/user/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.hzya.frame.sysnew.user.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -380,7 +381,42 @@ public class SysUserServiceImpl extends BaseService<SysUserEntity, String> imple
         interfaceCache.reloadData("1");
         return BaseResult.getSuccessMessageEntity("重置密码成功");
     }
-
+    /**
+     * @param jsonObject
+     * @return com.hzya.frame.web.entity.JsonResultEntity
+     * @Author lvleigang
+     * @Description 重置密码
+     * @Date 2:37 下午 2024/3/27
+     **/
+    @Override
+    public JsonResultEntity userResetPassword(JSONObject jsonObject) {
+        SysUserEntity entity = getData("jsonStr", jsonObject, SysUserEntity.class);
+        if (entity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if (entity.getOldPassword() == null || "".equals(entity.getOldPassword())) {
+            return BaseResult.getFailureMessageEntity("请先输入原密码");
+        }
+        if (entity.getPassword() == null || "".equals(entity.getPassword())) {
+            return BaseResult.getFailureMessageEntity("请先输入新密码");
+        }
+        if(entity.getPassword().equals(entity.getOldPassword())){
+            return BaseResult.getFailureMessageEntity("新密码和原密码不能一样");
+        }
+        SysUserEntity  oldEntity = sysUserDao.get(StpUtil.getLoginIdAsString());
+        if (oldEntity == null) {
+            return BaseResult.getFailureMessageEntity("系统错误");
+        }
+        if(!oldEntity.getPassword().equals(AESUtil.encrypt(oldEntity.getLoginCode()+"-"+entity.getOldPassword()))){
+            return BaseResult.getFailureMessageEntity("原密码错误，请重新输入");
+        }
+        oldEntity.setPassword(AESUtil.encrypt(oldEntity.getLoginCode()+"-"+entity.getPassword()));
+        oldEntity.setUpdate();
+        //保存密码
+        sysUserDao.update(oldEntity);
+        interfaceCache.reloadData("1");
+        return BaseResult.getSuccessMessageEntity("重置密码成功");
+    }
 
     /**
      * @param jsonObject