refactor: 注解从common移至core包下

src/main/java/com/youlai/boot/common/base/BasePageQuery.java

@@ -19,10 +19,11 @@ public class BasePageQuery implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-
     @Schema(description = "页码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private int pageNum = 1;
 
     @Schema(description = "每页记录数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     private int pageSize = 10;
+
+
 }

src/main/java/com/youlai/boot/core/annotation/DataPermission.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.core.annotation;
 
 import java.lang.annotation.*;
 

src/main/java/com/youlai/boot/core/annotation/Log.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.core.annotation;
 
 import com.youlai.boot.common.enums.LogModuleEnum;
 

src/main/java/com/youlai/boot/core/annotation/RepeatSubmit.java

@@ -1,4 +1,4 @@
-package com.youlai.boot.common.annotation;
+package com.youlai.boot.core.annotation;
 
 
 import java.lang.annotation.*;

src/main/java/com/youlai/boot/core/aspect/LogAspect.java

@@ -34,12 +34,12 @@ public class LogAspect {
     private final LogService logService;
     private final HttpServletRequest request;
 
-    @Pointcut("@annotation(com.youlai.boot.common.annotation.Log)")
+    @Pointcut("@annotation(com.youlai.boot.core.annotation.Log)")
     public void logPointcut() {
     }
 
     @Around("logPointcut() && @annotation(logAnnotation)")
-    public Object logExecutionTime(ProceedingJoinPoint joinPoint, com.youlai.boot.common.annotation.Log logAnnotation) throws Throwable {
+    public Object logExecutionTime(ProceedingJoinPoint joinPoint, com.youlai.boot.core.annotation.Log logAnnotation) throws Throwable {
         String requestURI = request.getRequestURI();
 
         Long userId = null;

src/main/java/com/youlai/boot/core/aspect/RepeatSubmitAspect.java

@@ -7,7 +7,7 @@ import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SecurityConstants;
 import com.youlai.boot.common.result.ResultCode;
 import com.youlai.boot.common.exception.BusinessException;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/youlai/boot/core/handler/MyDataPermissionHandler.java

@@ -3,7 +3,7 @@ package com.youlai.boot.core.handler;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.core.annotation.DataPermission;
 import com.youlai.boot.common.base.IBaseEnum;
 import com.youlai.boot.common.enums.DataScopeEnum;
 import com.youlai.boot.core.security.util.SecurityUtils;

src/main/java/com/youlai/boot/shared/auth/controller/AuthController.java

@@ -6,7 +6,7 @@ import com.youlai.boot.shared.auth.model.RefreshTokenRequest;
 import com.youlai.boot.shared.auth.service.AuthService;
 import com.youlai.boot.shared.auth.model.CaptchaResponse;
 import com.youlai.boot.shared.auth.model.AuthTokenResponse;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/shared/codegen/controller/CodegenController.java

@@ -10,7 +10,7 @@ import com.youlai.boot.shared.codegen.model.form.GenConfigForm;
 import com.youlai.boot.shared.codegen.model.query.TablePageQuery;
 import com.youlai.boot.shared.codegen.model.vo.CodegenPreviewVO;
 import com.youlai.boot.shared.codegen.model.vo.TablePageVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import com.youlai.boot.shared.codegen.service.GenConfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/youlai/boot/system/controller/DeptController.java

@@ -1,13 +1,13 @@
 package com.youlai.boot.system.controller;
 
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.form.DeptForm;
 import com.youlai.boot.system.model.query.DeptQuery;
 import com.youlai.boot.system.model.vo.DeptVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import com.youlai.boot.system.service.DeptService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/system/controller/DictController.java

@@ -1,15 +1,14 @@
 package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.PageResult;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.system.model.form.DictForm;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import com.youlai.boot.system.model.vo.DictVO;
 import com.youlai.boot.system.service.DictService;
 import io.swagger.v3.oas.annotations.Parameter;

src/main/java/com/youlai/boot/system/controller/DictDataController.java

@@ -1,8 +1,8 @@
 package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.PageResult;

src/main/java/com/youlai/boot/system/controller/MenuController.java

@@ -2,13 +2,13 @@ package com.youlai.boot.system.controller;
 
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.system.model.form.MenuForm;
 import com.youlai.boot.system.model.query.MenuQuery;
 import com.youlai.boot.system.model.vo.MenuVO;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.vo.RouteVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.system.service.MenuService;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/youlai/boot/system/controller/RoleController.java

@@ -2,14 +2,14 @@ package com.youlai.boot.system.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.boot.common.enums.LogModuleEnum;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.common.model.Option;
 import com.youlai.boot.common.result.PageResult;
 import com.youlai.boot.common.result.Result;
 import com.youlai.boot.system.model.form.RoleForm;
 import com.youlai.boot.system.model.query.RolePageQuery;
 import com.youlai.boot.system.model.vo.RolePageVO;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
 import com.youlai.boot.system.service.RoleService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/youlai/boot/system/controller/UserController.java

@@ -4,8 +4,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.core.annotation.Log;
-import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.core.annotation.RepeatSubmit;
 import com.youlai.boot.system.enums.ContactType;
 import com.youlai.boot.common.enums.LogModuleEnum;
 import com.youlai.boot.common.model.Option;
@@ -60,7 +60,7 @@ public class UserController {
     @GetMapping("/page")
     @Log(value = "用户分页列表", module = LogModuleEnum.USER)
     public PageResult<UserPageVO> getUserPage(
-            UserPageQuery queryParams
+            @Valid UserPageQuery queryParams
     ) {
         IPage<UserPageVO> result = userService.getUserPage(queryParams);
         return PageResult.success(result);

src/main/java/com/youlai/boot/system/mapper/DeptMapper.java

@@ -3,7 +3,7 @@ package com.youlai.boot.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.core.annotation.DataPermission;
 import com.youlai.boot.system.model.entity.Dept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/youlai/boot/system/mapper/UserMapper.java

@@ -6,7 +6,7 @@ import com.youlai.boot.system.model.bo.UserBO;
 import com.youlai.boot.system.model.entity.User;
 import com.youlai.boot.system.model.query.UserPageQuery;
 import com.youlai.boot.system.model.form.UserForm;
-import com.youlai.boot.common.annotation.DataPermission;
+import com.youlai.boot.core.annotation.DataPermission;
 import com.youlai.boot.system.model.dto.UserAuthInfo;
 import com.youlai.boot.system.model.dto.UserExportDTO;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java

@@ -1,6 +1,8 @@
 package com.youlai.boot.system.model.query;
 
+import cn.hutool.db.sql.Direction;
 import com.youlai.boot.common.base.BasePageQuery;
+import com.youlai.boot.core.annotation.ValidField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,22 +17,30 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Schema(description ="用户分页查询对象")
+@Schema(description = "用户分页查询对象")
 public class UserPageQuery extends BasePageQuery {
 
-    @Schema(description="关键字(用户名/昵称/手机号)")
+    @Schema(description = "关键字(用户名/昵称/手机号)")
     private String keywords;
 
-    @Schema(description="用户状态")
+    @Schema(description = "用户状态")
     private Integer status;
 
-    @Schema(description="部门ID")
+    @Schema(description = "部门ID")
     private Long deptId;
 
-    @Schema(description="角色ID")
+    @Schema(description = "角色ID")
     private List<Long> roleIds;
 
-    @Schema(description="创建时间范围")
+    @Schema(description = "创建时间范围")
     private List<String> createTime;
 
+    @Schema(description = "排序的字段")
+    @ValidField(allowedValues = {"create_time","update_time"})
+    private String field;
+
+    @Schema(description = "排序方式（正序:ASC；反序:DESC）")
+    private Direction direction;
+
+
 }

src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java

@@ -1,8 +1,6 @@
 package com.youlai.boot.system.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -15,7 +13,6 @@ import com.youlai.boot.system.model.entity.DictData;
 import com.youlai.boot.system.model.form.DictForm;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.vo.DictVO;
 import com.youlai.boot.system.service.DictDataService;
 import com.youlai.boot.system.service.DictService;
@@ -23,7 +20,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.List;
 
 /**
  * 数据字典业务实现类

src/main/resources/mapper/system/UserMapper.xml

@@ -62,6 +62,16 @@
         </where>
         GROUP BY
             u.id
+        <choose>
+            <!-- 如果排序参数都传入 -->
+            <when test="queryParams.field != null and queryParams.field != '' and queryParams.direction != null">
+                ORDER BY u.${queryParams.field} ${queryParams.direction}
+            </when>
+            <!-- 默认排序 -->
+            <otherwise>
+                ORDER BY u.update_time DESC, u.create_time DESC
+            </otherwise>
+        </choose>
     </select>
 
     <!-- 用户表单信息映射 -->