提交

my-test/src/main/java/org/example/join/model/IQueryColumn.java

@@ -1,5 +0,0 @@
-package org.example.join.model;
-
-public interface IQueryColumn extends IFormat {
-
-}

my-test/src/main/java/org/example/join/model/AbstractQueryColumn.java → my-test/src/main/java/org/example/join/model/query/column/AbstractQueryColumn.java

@@ -1,4 +1,4 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import org.apache.ibatis.reflection.property.PropertyNamer;
+import org.example.join.model.query.condition.QueryCondition;
 import org.example.join.sql.SqlConstant;
 
 import java.util.ArrayList;

my-test/src/main/java/org/example/join/model/query/column/IQueryColumn.java

@@ -0,0 +1,7 @@
+package org.example.join.model.query.column;
+
+import org.example.join.model.IFormat;
+
+public interface IQueryColumn extends IFormat {
+
+}

my-test/src/main/java/org/example/join/model/QueryColumn.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumn.java

@@ -1,9 +1,10 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import org.example.join.model.IFormat;
 import org.example.join.sql.SqlContext;
 
 import java.util.ArrayList;

my-test/src/main/java/org/example/join/model/QueryColumnAlias.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumnAlias.java

@@ -1,7 +1,8 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
 
 @RequiredArgsConstructor
 public class QueryColumnAlias implements IQueryColumn {

my-test/src/main/java/org/example/join/model/QueryColumnCompute.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumnCompute.java

@@ -1,6 +1,7 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
 
 @RequiredArgsConstructor
 public class QueryColumnCompute implements IFormat {

my-test/src/main/java/org/example/join/model/QueryColumnField.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumnField.java

@@ -1,4 +1,4 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Getter;

my-test/src/main/java/org/example/join/model/QueryColumnFields.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumnFields.java

@@ -1,4 +1,4 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;

my-test/src/main/java/org/example/join/model/QueryColumnOrder.java → my-test/src/main/java/org/example/join/model/query/column/QueryColumnOrder.java

@@ -1,6 +1,7 @@
-package org.example.join.model;
+package org.example.join.model.query.column;
 
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
 
 @RequiredArgsConstructor
 public class QueryColumnOrder implements IFormat {

my-test/src/main/java/org/example/join/model/QueryCondition.java → my-test/src/main/java/org/example/join/model/query/condition/QueryCondition.java

@@ -1,8 +1,9 @@
-package org.example.join.model;
+package org.example.join.model.query.condition;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
 import org.example.join.sql.SqlConstant;
 import org.example.join.sql.SqlContext;
 

my-test/src/main/java/org/example/join/model/QueryConditionConnect.java → my-test/src/main/java/org/example/join/model/query/condition/QueryConditionConnect.java

@@ -1,8 +1,9 @@
-package org.example.join.model;
+package org.example.join.model.query.condition;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
 
 @RequiredArgsConstructor
 public class QueryConditionConnect implements IFormat {

my-test/src/main/java/org/example/join/model/DefaultFunction.java → my-test/src/main/java/org/example/join/model/query/function/DefaultFunction.java

@@ -1,5 +1,6 @@
-package org.example.join.model;
+package org.example.join.model.query.function;
 
+import org.example.join.model.query.column.IQueryColumn;
 import org.example.join.sql.SqlConstant;
 
 /**

my-test/src/main/java/org/example/join/model/QueryFunction.java → my-test/src/main/java/org/example/join/model/query/function/QueryFunction.java

@@ -1,7 +1,8 @@
-package org.example.join.model;
+package org.example.join.model.query.function;
 
 import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import org.example.join.model.query.column.AbstractQueryColumn;
 import org.example.join.sql.SqlContext;
 
 import java.util.List;

my-test/src/main/java/org/example/join/model/TableChild.java → my-test/src/main/java/org/example/join/model/table/ChildTable.java

@@ -1,4 +1,4 @@
-package org.example.join.model;
+package org.example.join.model.table;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Getter;
@@ -7,7 +7,7 @@ import org.example.join.sql.Sql;
 
 @Getter
 @RequiredArgsConstructor
-public class TableChild implements ITable {
+public class ChildTable implements ITable {
 
     private final Sql sql;
     private final String alias;

my-test/src/main/java/org/example/join/model/ITable.java → my-test/src/main/java/org/example/join/model/table/ITable.java

@@ -1,4 +1,7 @@
-package org.example.join.model;
+package org.example.join.model.table;
+
+import org.example.join.model.IFormat;
+import org.example.join.model.query.column.QueryColumnField;
 
 public interface ITable extends IFormat {
 

my-test/src/main/java/org/example/join/model/TableJoin.java → my-test/src/main/java/org/example/join/model/table/JoinTable.java

@@ -1,10 +1,12 @@
-package org.example.join.model;
+package org.example.join.model.table;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.example.join.model.IFormat;
+import org.example.join.model.query.condition.QueryCondition;
 import org.example.join.sql.SqlConstant;
 
 import java.util.ArrayList;
@@ -13,7 +15,7 @@ import java.util.stream.Collectors;
 
 @Getter
 @RequiredArgsConstructor
-public class TableJoin implements IFormat {
+public class JoinTable implements IFormat {
 
     private final String joinType;
     private final ITable table;

my-test/src/main/java/org/example/join/model/Table.java → my-test/src/main/java/org/example/join/model/table/Table.java

@@ -1,4 +1,4 @@
-package org.example.join.model;
+package org.example.join.model.table;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;

my-test/src/main/java/org/example/join/sql/From.java

@@ -1,7 +1,7 @@
 package org.example.join.sql;
 
-import org.example.join.model.ITable;
-import org.example.join.model.TableJoin;
+import org.example.join.model.table.ITable;
+import org.example.join.model.table.JoinTable;
 
 public class From extends SqlWrapper {
 
@@ -25,9 +25,9 @@ public class From extends SqlWrapper {
     }
 
     private Join join(String joinType, ITable table) {
-        TableJoin tableJoin = new TableJoin(joinType, table);
-        sql.tableJoinList.add(tableJoin);
-        return new Join(this, tableJoin.getQueryConditionList());
+        JoinTable joinTable = new JoinTable(joinType, table);
+        sql.joinTableList.add(joinTable);
+        return new Join(this, joinTable.getQueryConditionList());
     }
 
 }

my-test/src/main/java/org/example/join/sql/Join.java

@@ -3,7 +3,7 @@ package org.example.join.sql;
 import cn.hutool.core.collection.ListUtil;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
-import org.example.join.model.QueryCondition;
+import org.example.join.model.query.condition.QueryCondition;
 
 import java.util.List;
 

my-test/src/main/java/org/example/join/sql/Select.java

@@ -3,8 +3,8 @@ package org.example.join.sql;
 import cn.hutool.core.collection.ListUtil;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
-import org.example.join.model.IQueryColumn;
-import org.example.join.model.ITable;
+import org.example.join.model.query.column.IQueryColumn;
+import org.example.join.model.table.ITable;
 
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class Select {

my-test/src/main/java/org/example/join/sql/Sql.java

@@ -6,13 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.example.join.model.IFormat;
-import org.example.join.model.IQueryColumn;
-import org.example.join.model.ITable;
-import org.example.join.model.QueryColumnField;
-import org.example.join.model.QueryColumnOrder;
-import org.example.join.model.QueryCondition;
-import org.example.join.model.Table;
-import org.example.join.model.TableJoin;
+import org.example.join.model.query.column.IQueryColumn;
+import org.example.join.model.table.ITable;
+import org.example.join.model.query.column.QueryColumnField;
+import org.example.join.model.query.column.QueryColumnOrder;
+import org.example.join.model.query.condition.QueryCondition;
+import org.example.join.model.table.Table;
+import org.example.join.model.table.JoinTable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,7 @@ public class Sql implements IFormat {
 
     protected final List<IQueryColumn> queryFieldsList = new ArrayList<>();
     protected final List<ITable> tableList = new ArrayList<>();
-    protected final List<TableJoin> tableJoinList = new ArrayList<>();
+    protected final List<JoinTable> joinTableList = new ArrayList<>();
     protected final List<QueryCondition> queryConditionList = new ArrayList<>();
     protected final List<QueryColumnField> groupByList = new ArrayList<>();
     protected final List<QueryColumnOrder> orderByList = new ArrayList<>();
@@ -106,7 +106,7 @@ public class Sql implements IFormat {
         sqlBuilder.append(SqlConstant.FROM).append(queryTable);
 
         // joinTable
-        String joinTable = listFormatSql(sql.tableJoinList, StringPool.EMPTY);
+        String joinTable = listFormatSql(sql.joinTableList, StringPool.EMPTY);
         if (StrUtil.isNotBlank(joinTable)) {
             sqlBuilder.append(joinTable);
         }
@@ -154,12 +154,12 @@ public class Sql implements IFormat {
             }
         }
 
-        for (TableJoin tableJoin : sql.tableJoinList) {
-            if (tableJoin.getTable() instanceof Table table) {
+        for (JoinTable joinTable : sql.joinTableList) {
+            if (joinTable.getTable() instanceof Table table) {
                 String tableDelFlag = SqlContext.getTableDelFlag(table);
                 if (ObjectUtil.isNotEmpty(tableDelFlag)) {
                     QueryColumnField field = table.field(tableDelFlag);
-                    tableJoin.getQueryConditionList().add(field.eq(sql.logic ? 1 : 0));
+                    joinTable.getQueryConditionList().add(field.eq(sql.logic ? 1 : 0));
                 }
             }
         }

my-test/src/main/java/org/example/join/sql/SqlContext.java

@@ -5,7 +5,7 @@ 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.model.IFormat;
-import org.example.join.model.Table;
+import org.example.join.model.table.Table;
 
 import java.util.HashMap;
 import java.util.Map;

my-test/src/main/java/org/example/join/sql/SqlWrapper.java

@@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.example.join.JoinMapper;
-import org.example.join.model.AbstractQueryColumn;
-import org.example.join.model.QueryColumnField;
-import org.example.join.model.QueryColumnOrder;
-import org.example.join.model.QueryCondition;
-import org.example.join.model.Table;
-import org.example.join.model.TableChild;
+import org.example.join.model.query.column.AbstractQueryColumn;
+import org.example.join.model.query.column.QueryColumnField;
+import org.example.join.model.query.column.QueryColumnOrder;
+import org.example.join.model.query.condition.QueryCondition;
+import org.example.join.model.table.Table;
+import org.example.join.model.table.ChildTable;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -29,12 +29,12 @@ public class SqlWrapper extends AbstractQueryColumn {
 
     private final Sql sql;
 
-    public TableChild tableAs(String alias) {
-        return new TableChild(sql, alias);
+    public ChildTable tableAs(String alias) {
+        return new ChildTable(sql, alias);
     }
 
-    public TableChild tableAs(Table table) {
-        return new TableChild(sql, table.getAlias());
+    public ChildTable tableAs(Table table) {
+        return new ChildTable(sql, table.getAlias());
     }
 
     public SqlWrapper where(QueryCondition... queryCondition) {

my-test/src/test/java/MySpringBootTest.java

@@ -1,12 +1,12 @@
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import org.example.DromaraApplication;
-import org.example.join.model.DefaultFunction;
-import org.example.join.model.QueryColumn;
-import org.example.join.model.QueryColumnField;
-import org.example.join.model.QueryColumnFields;
-import org.example.join.model.Table;
-import org.example.join.model.TableChild;
+import org.example.join.model.query.function.DefaultFunction;
+import org.example.join.model.query.column.QueryColumn;
+import org.example.join.model.query.column.QueryColumnField;
+import org.example.join.model.query.column.QueryColumnFields;
+import org.example.join.model.table.Table;
+import org.example.join.model.table.ChildTable;
 import org.example.join.sql.Sql;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ public class MySpringBootTest implements DefaultFunction {
     @Test
     public void testCache() {
 
-        TableChild childTable = Sql.create()
+        ChildTable childTable = Sql.create()
                 .select(
                         sysDeptAll,
                         status