提交

my-test/src/main/java/org/example/join/JoinMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.example.join.sql.Sql;
-import org.example.join.sql.SqlProvider;
+import org.example.join.model.SqlProvider;
 
 import java.util.List;
 import java.util.Map;

my-test/src/main/java/org/example/join/sql/SqlConstant.java → my-test/src/main/java/org/example/join/model/SqlConstant.java

@@ -1,4 +1,4 @@
-package org.example.join.sql;
+package org.example.join.model;
 
 public interface SqlConstant {
 

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

@@ -1,10 +1,11 @@
-package org.example.join.sql;
+package org.example.join.model;
 
 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.model.IFormat;
+import org.example.join.model.SqlConstant;
 import org.example.join.model.table.Table;
 
 import java.util.HashMap;

my-test/src/main/java/org/example/join/sql/SqlProvider.java → my-test/src/main/java/org/example/join/model/SqlProvider.java

@@ -1,6 +1,8 @@
-package org.example.join.sql;
+package org.example.join.model;
 
 import com.baomidou.mybatisplus.core.assist.ISqlRunner;
+import org.example.join.model.SqlContext;
+import org.example.join.sql.Sql;
 
 import java.util.Map;
 

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

@@ -9,7 +9,7 @@ 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 org.example.join.model.SqlConstant;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -5,7 +5,7 @@ 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 org.example.join.model.SqlContext;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -4,8 +4,8 @@ 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;
+import org.example.join.model.SqlConstant;
+import org.example.join.model.SqlContext;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -1,7 +1,7 @@
 package org.example.join.model.query.function;
 
 import org.example.join.model.query.column.IQueryColumn;
-import org.example.join.sql.SqlConstant;
+import org.example.join.model.SqlConstant;
 
 /**
  * SQL 函数。

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

@@ -3,7 +3,7 @@ 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 org.example.join.model.SqlContext;
 
 import java.util.List;
 import java.util.StringJoiner;

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

@@ -7,7 +7,7 @@ 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 org.example.join.model.SqlConstant;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,5 +1,6 @@
 package org.example.join.sql;
 
+import org.example.join.model.SqlConstant;
 import org.example.join.model.table.ITable;
 import org.example.join.model.table.JoinTable;
 

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.example.join.model.IFormat;
+import org.example.join.model.SqlConstant;
+import org.example.join.model.SqlContext;
 import org.example.join.model.query.column.IQueryColumn;
 import org.example.join.model.query.column.QueryColumnField;
 import org.example.join.model.query.column.QueryColumnOrder;

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.example.join.JoinMapper;
+import org.example.join.model.SqlConstant;
 import org.example.join.model.query.column.AbstractQueryColumn;
 import org.example.join.model.query.column.QueryColumnField;
 import org.example.join.model.query.column.QueryColumnOrder;