1.新增用户激活功能

2.资源菜单唯一性条件调整

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);
+        }
+    }
+
 }
 

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);
 }

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);
         //更新的时候，需排除当前记录

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);
+    }
+
     /**
      * 根据登录名查询用户
      *