提交

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

@@ -1,8 +1,10 @@
 package org.example.join.domain;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import lombok.RequiredArgsConstructor;
 import org.example.join.sql.SqlContext;
 
+@RequiredArgsConstructor
 public class QueryColumn extends AbstractQueryColumn implements IFormat, IQueryColumn {
 
     /**
@@ -15,11 +17,6 @@ public class QueryColumn extends AbstractQueryColumn implements IFormat, IQueryC
      */
     private final String name;
 
-    public QueryColumn(Table table, String name) {
-        this.table = table;
-        this.name = name;
-    }
-
     @Override
     protected QueryColumn copy() {
         QueryColumn queryColumn = new QueryColumn(this.table, this.name);

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

@@ -1,9 +1,9 @@
 package org.example.join.domain;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class QueryColumnAlias implements IFormat, IQueryColumn {
 
     /**

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

@@ -1,8 +1,8 @@
 package org.example.join.domain;
 
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class QueryColumnCompute implements IFormat {
 
     /**

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

@@ -2,6 +2,7 @@ package org.example.join.domain;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import lombok.RequiredArgsConstructor;
 import org.example.join.util.SqlConstant;
 import org.example.join.util.SqlUtil;
 
@@ -11,26 +12,13 @@ import java.util.List;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
+@RequiredArgsConstructor
 public class QueryCondition implements IFormat {
 
     private final IQueryColumn column;
     private final String logic;
     private final Object value;
-    private final List<QueryConditionConnect> queryConditionConnectList;
-
-    public QueryCondition(IQueryColumn column, String logic, Object value) {
-        this.column = column;
-        this.logic = logic;
-        this.value = value;
-        this.queryConditionConnectList = new ArrayList<>();
-    }
-
-    public QueryCondition(IQueryColumn column, String logic, Object value, List<QueryConditionConnect> queryConditionConnectList) {
-        this.column = column;
-        this.logic = logic;
-        this.value = value;
-        this.queryConditionConnectList = queryConditionConnectList;
-    }
+    private final List<QueryConditionConnect> queryConditionConnectList = new ArrayList<>();
 
     public QueryCondition and(QueryCondition queryCondition) {
         QueryCondition newQueryCondition = copy();
@@ -44,8 +32,10 @@ public class QueryCondition implements IFormat {
         return newQueryCondition;
     }
 
-    public QueryCondition copy() {
-        return new QueryCondition(this.column, this.logic, this.value, new ArrayList<>(this.queryConditionConnectList));
+    private QueryCondition copy() {
+        QueryCondition queryCondition = new QueryCondition(this.column, this.logic, this.value);
+        queryCondition.queryConditionConnectList.addAll(this.queryConditionConnectList);
+        return queryCondition;
     }
 
     @Override

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

@@ -2,9 +2,9 @@ package org.example.join.domain;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class QueryConditionConnect implements IFormat {
 
     /**

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

@@ -1,8 +1,8 @@
 package org.example.join.domain;
 
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class QueryConditionOrder implements IFormat {
 
     /**

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

@@ -15,6 +15,11 @@ public class Table implements IFormat, ITable {
         this.name = name;
     }
 
+    public Table(String alias, String name) {
+        this.alias = alias;
+        this.name = name;
+    }
+
     @Override
     public String toSql() {
         return name + StringPool.SPACE + SqlContext.getTableAlias(this);

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

@@ -1,19 +1,20 @@
 package org.example.join.domain;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.example.join.util.SqlConstant;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Getter
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class TableJoin implements IFormat, ITable {
 
     private final String joinType;
     private final Table table;
-    private final List<QueryCondition> queryConditionList;
+    private final List<QueryCondition> queryConditionList = new ArrayList<>();
 
     @Override
     public String toSql() {

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

@@ -12,7 +12,7 @@ import org.example.join.domain.QueryConditionOrder;
 import java.util.ArrayList;
 import java.util.List;
 
-@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class Sql<R> {
 
     protected final Class<R> resultCls;