From 2bc128963cfb22ffff6d64b941a9f99e56967eb1 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 8 Feb 2023 09:15:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=BF=80?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=9F=E8=83=BD=202.=E8=B5=84=E6=BA=90=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=94=AF=E4=B8=80=E6=80=A7=E6=9D=A1=E4=BB=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/user/controller/UserController.java  | 20 +++++++++++++++++++
 .../com/njcn/user/service/IUserService.java   |  2 ++
 .../service/impl/FunctionServiceImpl.java     |  2 ++
 .../user/service/impl/UserServiceImpl.java    |  9 +++++++++
 4 files changed, 33 insertions(+)

diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
index e60017039..6defa6687 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
@@ -333,5 +333,25 @@ public class UserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 用于激活处于休眠、锁定、密码过期的用户
+     * @param id 用户ID
+     * @return
+     */
+    @OperateInfo
+    @PutMapping("/activateUser")
+    @ApiOperation("用户激活")
+    @ApiImplicitParam(name = "id", value = "用户id")
+    public HttpResult<Boolean> activateUser(String id) {
+        String methodDescribe = getMethodDescribe("activateUser");
+        LogUtil.njcnDebug(log, "{}，用户输入的id：{}", methodDescribe, id);
+        boolean result = userService.activateUser(id);
+        if (result){
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
 }
 
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
index 3d6215c8d..33d2b212f 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
@@ -158,4 +158,6 @@ public interface IUserService extends IService<User> {
      * @return 用户列表表格的绝对路径
      */
     String exportUser(UserParam.UserQueryParam queryParam,String methodDescribe);
+
+    boolean activateUser(String id);
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
index 100400e02..a0c283074 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
@@ -281,10 +281,12 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
     /**
      * 校验参数，
      * 1.检查是否存在相同名称的菜单
+     * 名称 && 路径做唯一判断
      */
     private void checkFunctionParam(FunctionParam functionParam, boolean isExcludeSelf) {
         LambdaQueryWrapper<Function> functionLambdaQueryWrapper = new LambdaQueryWrapper<>();
         functionLambdaQueryWrapper
+                .eq(Function::getName, functionParam.getName())
                 .eq(Function::getPath, functionParam.getPath())
                 .eq(Function::getState, FunctionState.ENABLE);
         //更新的时候，需排除当前记录
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index e4282a436..61f596400 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
@@ -393,6 +393,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return FileUtil.getAbsolutePath(excel);
     }
 
+    @Override
+    public boolean activateUser(String id) {
+        User user = this.lambdaQuery().eq(User::getId, id).one();
+        user.setPwdValidity(LocalDateTime.now());
+        user.setLoginTime(LocalDateTime.now());
+        user.setState(UserState.ENABLE);
+        return this.updateById(user);
+    }
+
     /**
      * 根据登录名查询用户
      *