From c6a708cbd303ee54ea4075ad7410fb97d9b69443 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 27 Oct 2023 16:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/win/framework/common/package-info.java | 6 ------ .../java/com/win/framework/common/pojo/PageParam.java | 4 ++-- .../java/com/win/framework/common/util/package-info.java | 7 ------- .../win/framework/mybatis/core/mapper/BaseMapperX.java | 7 ++++--- .../framework/mybatis/core/util/QueryWrapperUtils.java | 9 --------- 5 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 win-framework/win-common/src/main/java/com/win/framework/common/package-info.java delete mode 100644 win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/package-info.java b/win-framework/win-common/src/main/java/com/win/framework/common/package-info.java deleted file mode 100644 index b5477927..00000000 --- a/win-framework/win-common/src/main/java/com/win/framework/common/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 基础的通用类，和框架无关 - * - * 例如说，CommonResult 为通用返回 - */ -package com.win.framework.common; diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java b/win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java index 11237725..a340b467 100644 --- a/win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java +++ b/win-framework/win-common/src/main/java/com/win/framework/common/pojo/PageParam.java @@ -41,13 +41,13 @@ public class PageParam implements Serializable { * 字段 */ @Schema(description = "排序属性", requiredMode = Schema.RequiredMode.REQUIRED, example = "userName") - private String sort = "create_time"; + private String sort; /** * 顺序 */ @Schema(description = "排序类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "DESC") - private String by = "DESC"; + private String by; public void setSort(String sort) { if(sort != null) { diff --git a/win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java b/win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java deleted file mode 100644 index f9b8af7a..00000000 --- a/win-framework/win-common/src/main/java/com/win/framework/common/util/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * 对于工具类的选择，优先查找 Hutool 中有没对应的方法 - * 如果没有，则自己封装对应的工具类，以 Utils 结尾，用于区分 - * - * ps：如果担心 Hutool 存在坑的问题，可以阅读 Hutool 的实现源码，以确保可靠性。并且，可以补充相关的单元测试。 - */ -package com.win.framework.common.util; diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java index 6f06744a..01b6e96c 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/mapper/BaseMapperX.java @@ -1,16 +1,17 @@ package com.win.framework.mybatis.core.mapper; import cn.hutool.core.collection.CollUtil; -import com.win.framework.common.pojo.PageParam; -import com.win.framework.common.pojo.PageResult; -import com.win.framework.mybatis.core.util.MyBatisUtils; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.toolkit.Db; import com.github.yulichang.base.MPJBaseMapper; +import com.win.framework.common.pojo.PageParam; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.mybatis.core.util.MyBatisUtils; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java index bbc77931..cd56429b 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/util/QueryWrapperUtils.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.base.CaseFormat; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.util.collection.CollectionUtils; -import org.apache.commons.lang3.StringUtils; /** * QueryWrapper工具类 @@ -19,14 +18,6 @@ public class QueryWrapperUtils { */ public static QueryWrapper structure(CustomConditions customConditions) { QueryWrapper queryWrapper = new QueryWrapper<>(); - String sorting = customConditions.getSort(); - if(StringUtils.isEmpty(sorting)) { - if(CustomConditions.ORDER_DESC.equals(customConditions.getBy())) { - queryWrapper.orderByDesc(sorting); - } else { - queryWrapper.orderByAsc(sorting); - } - } if(CollectionUtils.isAnyEmpty(customConditions.getFilters())) { return queryWrapper; }