From de6f13ec2767c003ee4983a7b7725445ec284c64 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 7 Jul 2023 14:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/AuthUserController.java   | 26 ++++++++-----
 .../com/glxp/api/dao/auth/AuthAdminDao.java   |  3 ++
 .../glxp/api/req/auth/UpdateUserRequset.java  | 38 +++++++++++++++++++
 .../api/service/auth/AuthAdminService.java    |  3 ++
 .../api/service/auth/CustomerService.java     |  7 ++++
 .../auth/impl/AuthAdminServiceImpl.java       | 18 +++++++++
 .../mybatis/mapper/auth/AuthAdminDao.xml      | 10 +++++
 7 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java

diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
index ad15c27e1..b5da0f74f 100644
--- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
+++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java
@@ -6,10 +6,7 @@ import com.glxp.api.annotation.Log;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.*;
-import com.glxp.api.req.auth.AuthUserSaveRequest;
-import com.glxp.api.req.auth.FilterInvLinkDataRequest;
-import com.glxp.api.req.auth.FilterInvWarehouseRequest;
-import com.glxp.api.req.auth.FilterNoSelectUserRequest;
+import com.glxp.api.req.auth.*;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -136,13 +133,24 @@ public class AuthUserController extends BaseController {
         return ResultVOUtils.success(authAdmin);
     }
 
-    //查询用户名信息
+    //修改用户名信息
     @AuthRuleAnnotation("")
     @PostMapping("/admin/auth/admin/updateUser")
-    public BaseResponse updateUser() {
-
-        AuthAdmin authAdmin = customerService.getUserBean();
-        return ResultVOUtils.success(authAdmin);
+    public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) {
+        AuthAdmin authAdmin=customerService.getUserBean();
+        System.out.println(updateUserRequset.toString());
+        if (!updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){
+            return ResultVOUtils.success("当前密码输入错误！请重新输入！");
+        }
+        if (updateUserRequset.getNewPassword().equals(authAdmin.getPassWord())){
+            return ResultVOUtils.error(ResultEnum.valueOf("新密码与旧密码重复！请重新修改！"));
+        }
+        if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword())&&updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){
+            customerService.update(updateUserRequset);
+        }else {
+            return ResultVOUtils.error(ResultEnum.valueOf("新密码与确认密码不相同！请重新修改！"));
+        }
+        return ResultVOUtils.success("修改成功");
     }
 
 }
diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
index e496b2901..7ddf8ebdb 100644
--- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
+++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java
@@ -3,6 +3,7 @@ package com.glxp.api.dao.auth;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
+import com.glxp.api.req.auth.UpdateUserRequset;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -60,6 +61,8 @@ public interface AuthAdminDao extends BaseMapperPlus<AuthAdminDao, AuthAdmin, Au
      */
     boolean updateAuthAdmin(AuthAdmin authAdmin);
 
+    boolean updateUser(UpdateUserRequset updateUserRequset);
+
     /**
      * 删除
      *
diff --git a/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java
new file mode 100644
index 000000000..c3a94ee66
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java
@@ -0,0 +1,38 @@
+package com.glxp.api.req.auth;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.glxp.api.entity.auth.SysRole;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class UpdateUserRequset {
+    // 主键
+    private Long id;
+    private String userName;
+    // 登录密码
+    private String passWord;
+    private String newPassword;
+    private String confirmPassword;
+    // 最后登录ip
+    private String lastLoginIp;
+    // 最后登录时间
+    private Date lastLoginTime;
+    // 创建时间
+    private Date createTime;
+    // 状态
+    private Integer userFlag;
+    private Date lastModifyTime;
+    private String comments;
+    private String employeeName;
+    private Long CustomerId;
+    private String locDeptCode;
+    private String locInvCode;
+    private String deptName;
+    private List<SysRole> roles;
+    private Long[] roleIds;
+
+
+}
diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java
index 9ecd12eff..9eee80df9 100644
--- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java
+++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.FilterNoSelectUserRequest;
+import com.glxp.api.req.auth.UpdateUserRequset;
 
 import java.util.List;
 
@@ -24,6 +25,8 @@ public interface AuthAdminService extends IService<AuthAdmin> {
 
     boolean updateAuthAdmin(AuthAdmin authAdmin);
 
+    boolean updateUser(UpdateUserRequset updateUserRequset);
+
     boolean deleteById(Long id);
 
     /**
diff --git a/src/main/java/com/glxp/api/service/auth/CustomerService.java b/src/main/java/com/glxp/api/service/auth/CustomerService.java
index 747bfe855..4ac834d2f 100644
--- a/src/main/java/com/glxp/api/service/auth/CustomerService.java
+++ b/src/main/java/com/glxp/api/service/auth/CustomerService.java
@@ -3,6 +3,8 @@ package com.glxp.api.service.auth;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.auth.UpdateUserRequset;
+import lombok.val;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -50,4 +52,9 @@ public class CustomerService {
         return authAdmin.getUserName();
     }
 
+
+    public boolean update(UpdateUserRequset updateUserRequset) {
+
+        return authAdminService.updateUser(updateUserRequset);
+    }
 }
diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
index 14057b69a..ef1e8996d 100644
--- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java
@@ -12,6 +12,7 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.auth.FilterAuthUserRequest;
 import com.glxp.api.req.auth.FilterNoSelectUserRequest;
 import com.glxp.api.req.auth.FilterUserRoleRequest;
+import com.glxp.api.req.auth.UpdateUserRequset;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.common.enums.ResultEnum;
 import org.springframework.stereotype.Service;
@@ -115,6 +116,23 @@ public class AuthAdminServiceImpl extends ServiceImpl<AuthAdminDao, AuthAdmin> i
         return authAdminDao.updateAuthAdmin(authAdmin);
     }
 
+    @Override
+    public boolean updateUser(UpdateUserRequset updateUserRequset) {
+        if (updateUserRequset.getId() == null) {
+            return false;
+        }
+        return authAdminDao.updateUser(updateUserRequset);
+    }
+
+//    @Override
+//    public boolean updateAuthAdmin(UpdateUserRequset updateUserRequset) {
+//
+//        if (updateUserRequset.getId() == null) {
+//            return false;
+//        }
+//        return authAdminDao.updateUser(updateUserRequset);
+//    }
+
     /**
      * 根据id删除
      *
diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
index f3cf1b4a5..9e9dbfc60 100644
--- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
@@ -170,6 +170,16 @@
         WHERE id = #{id}
     </update>
 
+    <update id="updateUser" parameterType="com.glxp.api.req.auth.UpdateUserRequset">
+        UPDATE auth_user
+        <set>
+            <if test="passWord != null">
+                passWord=#{newPassword},
+            </if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
     <delete id="deleteById" parameterType="java.lang.Long">
         delete
         from auth_user