提交

base-starter/src/main/java/org/dromara/base/config/ResponseAdvice.java

@@ -2,7 +2,7 @@ package org.dromara.base.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.base.annotation.FormatIgnore;
-import org.dromara.base.domain.R;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.core.MethodParameter;
@@ -38,7 +38,7 @@ public class ResponseAdvice implements ResponseBodyAdvice<Object>, ErrorControll
         if (body instanceof R || body instanceof TableDataInfo) {
             return body;
         }
-        return R.success(body);
+        return R.ok("操作成功", body);
     }
 
 }

base-starter/src/main/java/org/dromara/base/domain/R.java

@@ -1,65 +0,0 @@
-package org.dromara.base.domain;
-
-import cn.hutool.core.util.StrUtil;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.Getter;
-import lombok.Setter;
-
-
-/**
- * 统一返回结果的类
- */
-@Getter
-@Setter
-public class R {
-
-    /**
-     * 是否成功
-     */
-    private Boolean success;
-
-    /**
-     * 返回码
-     */
-    private Integer code;
-
-    /**
-     * 返回消息
-     */
-    private String message;
-
-    /**
-     * 返回数据
-     */
-    private Object data;
-
-    private R(Boolean success, Integer code, String message) {
-        this.success = success;
-        this.code = code;
-        this.message = message;
-    }
-
-    private R(Boolean success, Integer code, String message, Object data) {
-        this.success = success;
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-
-    public static R success() {
-        return new R(true, HttpServletResponse.SC_OK, "成功");
-    }
-
-    public static R success(Object data) {
-        return new R(true, HttpServletResponse.SC_OK, "成功", data);
-    }
-
-    public static R fail(String errorMsg, Object... params) {
-        return new R(false, HttpServletResponse.SC_BAD_REQUEST, StrUtil.format(errorMsg, params));
-    }
-
-    public static R fail(Integer errorCode, String errorMsg, Object... params) {
-        return new R(false, errorCode, StrUtil.format(errorMsg, params));
-    }
-
-}

my-test/src/main/java/org/example/join/domain/QueryColumn.java

@@ -53,11 +53,6 @@ public class QueryColumn implements IFormat, IQueryColumn {
         return new QueryColumnAlias(alias, this);
     }
 
-    public QueryColumn tableAs(String tableAs) {
-        Table table = new Table(tableAs, this.table.getName());
-        return new QueryColumn(table, this.name, this.queryColumnComputeList);
-    }
-
     // ===========================================
     // 运算 加 减 乘 除 取余 + - * / %
     // ===========================================

my-test/src/main/java/org/example/join/domain/QueryColumnAlias.java

@@ -1,7 +1,7 @@
 package org.example.join.domain;
 
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AllArgsConstructor;
-import org.example.join.util.SqlConstant;
 
 import java.util.Map;
 
@@ -20,7 +20,7 @@ public class QueryColumnAlias implements IFormat, IQueryColumn {
 
     @Override
     public String toSql(Map<String, String> tableAliasMap, Map<String, Object> paramMap) {
-        return queryColumn.toSql(tableAliasMap, paramMap) + SqlConstant.AS + alias;
+        return queryColumn.toSql(tableAliasMap, paramMap) + StringPool.SPACE + alias;
     }
 
 }

my-test/src/main/java/org/example/join/domain/Table.java

@@ -1,7 +1,7 @@
 package org.example.join.domain;
 
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Getter;
-import org.example.join.util.SqlConstant;
 import org.example.join.util.SqlUtil;
 
 import java.util.Map;
@@ -17,18 +17,14 @@ public class Table implements IFormat, ITable {
         this.name = name;
     }
 
-    protected Table(String alias, String name) {
+    public Table(String alias, String name) {
         this.alias = alias;
         this.name = name;
     }
 
-    public Table as(String alias) {
-        return new Table(alias, this.name);
-    }
-
     @Override
     public String toSql(Map<String, String> tableAliasMap, Map<String, Object> paramMap) {
-        return name + SqlConstant.AS + SqlUtil.getTableAlias(this, tableAliasMap);
+        return name + StringPool.SPACE + SqlUtil.getTableAlias(this, tableAliasMap);
     }
 
 }

my-test/src/main/java/org/example/join/util/SqlConstant.java

@@ -11,7 +11,6 @@ public interface SqlConstant {
     String RIGHT_JOIN = " right join ";
     String GROUP_BY = " group by ";
     String ORDER_BY = " order by ";
-    String AS = " as ";
     String AND = " and ";
     String OR = " or ";
     String ON = " on ";

my-test/src/main/java/org/example/join/util/SqlUtil.java

@@ -4,16 +4,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import org.example.join.domain.Table;
 
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class SqlUtil {
 
-    private static final Map<String, String> delFlagMap = new ConcurrentHashMap<>();
-
     public static String getTableAlias(Table table, Map<String, String> tableAliasMap) {
         String tableAlias = table.getAlias();
         String tableName = table.getName();
@@ -28,15 +24,13 @@ public class SqlUtil {
     }
 
     public static String getTableDelFlag(Table table) {
-        return delFlagMap.computeIfAbsent(table.getName(), item -> {
-            TableInfo tableInfo = TableInfoHelper.getTableInfo(item);
-            for (TableFieldInfo tableFieldInfo : tableInfo.getFieldList()) {
-                if (tableFieldInfo.isLogicDelete()) {
-                    return tableFieldInfo.getColumn();
-                }
-            }
-            return StringPool.EMPTY;
-        });
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(table.getName());
+        if (!tableInfo.isWithLogicDelete()) {
+            return null;
+        }
+
+        TableFieldInfo logicDeleteFieldInfo = tableInfo.getLogicDeleteFieldInfo();
+        return logicDeleteFieldInfo.getColumn();
     }
 
 }

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java

@@ -23,28 +23,34 @@ import java.util.List;
 @Data
 public class PageQuery implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 1L;
+
     /**
      * 当前记录起始索引 默认值
      */
     public static final int DEFAULT_PAGE_NUM = 1;
+
     /**
      * 每页显示记录数 默认值 默认查全部
      */
     public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
-    @Serial
-    private static final long serialVersionUID = 1L;
+
     /**
      * 分页大小
      */
     private Integer pageSize;
+
     /**
      * 当前页数
      */
     private Integer pageNum;
+
     /**
      * 排序列
      */
     private String orderByColumn;
+
     /**
      * 排序的方向desc或者asc
      */