提交

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

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

my-test/src/main/java/org/example/join/domain/IFormat.java → my-test/src/main/java/org/example/join/model/IFormat.java

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

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

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 public interface IQueryColumn extends IFormat {
 

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

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 public interface ITable extends IFormat {
 }

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 import lombok.RequiredArgsConstructor;
 

my-test/src/main/java/org/example/join/domain/QueryColumnFunction.java → my-test/src/main/java/org/example/join/model/QueryColumnFunction.java

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;

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

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

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

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

my-test/src/main/java/org/example/join/domain/QueryConditionOrder.java → my-test/src/main/java/org/example/join/model/QueryConditionOrder.java

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 import lombok.RequiredArgsConstructor;
 

my-test/src/main/java/org/example/join/domain/QueryMethod.java → my-test/src/main/java/org/example/join/model/QueryMethod.java

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 import org.example.join.sql.SqlConstant;
 

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

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

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

@@ -1,4 +1,4 @@
-package org.example.join.domain;
+package org.example.join.model;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

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

@@ -1,7 +1,7 @@
 package org.example.join.sql;
 
-import org.example.join.domain.Table;
-import org.example.join.domain.TableJoin;
+import org.example.join.model.Table;
+import org.example.join.model.TableJoin;
 
 public class From<R> extends SqlWrapper<R> {
 

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

@@ -3,7 +3,7 @@ package org.example.join.sql;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
-import org.example.join.domain.QueryCondition;
+import org.example.join.model.QueryCondition;
 
 import java.util.Arrays;
 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.domain.IQueryColumn;
-import org.example.join.domain.Table;
+import org.example.join.model.IQueryColumn;
+import org.example.join.model.Table;
 
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public class Select<R> {

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

@@ -3,11 +3,11 @@ package org.example.join.sql;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
-import org.example.join.domain.IQueryColumn;
-import org.example.join.domain.ITable;
-import org.example.join.domain.QueryColumn;
-import org.example.join.domain.QueryCondition;
-import org.example.join.domain.QueryConditionOrder;
+import org.example.join.model.IQueryColumn;
+import org.example.join.model.ITable;
+import org.example.join.model.QueryColumn;
+import org.example.join.model.QueryCondition;
+import org.example.join.model.QueryConditionOrder;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -6,10 +6,10 @@ 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.IFormat;
-import org.example.join.domain.ITable;
-import org.example.join.domain.Table;
-import org.example.join.domain.TableJoin;
+import org.example.join.model.IFormat;
+import org.example.join.model.ITable;
+import org.example.join.model.Table;
+import org.example.join.model.TableJoin;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -4,14 +4,14 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.assist.ISqlRunner;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import org.example.join.domain.IFormat;
-import org.example.join.domain.IQueryColumn;
-import org.example.join.domain.ITable;
-import org.example.join.domain.QueryColumn;
-import org.example.join.domain.QueryCondition;
-import org.example.join.domain.QueryConditionOrder;
-import org.example.join.domain.Table;
-import org.example.join.domain.TableJoin;
+import org.example.join.model.IFormat;
+import org.example.join.model.IQueryColumn;
+import org.example.join.model.ITable;
+import org.example.join.model.QueryColumn;
+import org.example.join.model.QueryCondition;
+import org.example.join.model.QueryConditionOrder;
+import org.example.join.model.Table;
+import org.example.join.model.TableJoin;
 
 import java.util.List;
 import java.util.Map;

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

@@ -10,9 +10,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.example.join.JoinMapper;
-import org.example.join.domain.QueryColumn;
-import org.example.join.domain.QueryCondition;
-import org.example.join.domain.QueryConditionOrder;
+import org.example.join.model.QueryColumn;
+import org.example.join.model.QueryCondition;
+import org.example.join.model.QueryConditionOrder;
 
 import java.util.Arrays;
 import java.util.Date;

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

@@ -3,8 +3,8 @@ import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.mapper.SysUserMapper;
 import org.example.DromaraApplication;
-import org.example.join.domain.QueryColumn;
-import org.example.join.domain.Table;
+import org.example.join.model.QueryColumn;
+import org.example.join.model.Table;
 import org.example.join.sql.Sql;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,9 +14,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 
-import static org.example.join.domain.QueryMethod._if;
-import static org.example.join.domain.QueryMethod.concat;
-import static org.example.join.domain.QueryMethod.ifNull;
+import static org.example.join.model.QueryMethod._if;
+import static org.example.join.model.QueryMethod.concat;
+import static org.example.join.model.QueryMethod.ifNull;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DromaraApplication.class)