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