提交

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

@@ -11,78 +11,50 @@ public class QueryMethods {
     /**
      * 绝对值
      */
-    public static QueryColumnFunction abs(IQueryColumn queryColumn) {
-        return new QueryColumnFunction(SqlConstant.ABS, queryColumn);
+    public static QueryColumnFunction abs(Object obj) {
+        return new QueryColumnFunction(SqlConstant.ABS, obj);
     }
 
     /**
      * 平均值
      */
-    public static QueryColumnFunction avg(IQueryColumn queryColumn) {
-        return new QueryColumnFunction(SqlConstant.AVG, queryColumn);
+    public static QueryColumnFunction avg(Object obj) {
+        return new QueryColumnFunction(SqlConstant.AVG, obj);
     }
 
     /**
      * 数量
      */
-    public static QueryColumnFunction count(IQueryColumn queryColumn) {
-        return new QueryColumnFunction(SqlConstant.COUNT, queryColumn);
+    public static QueryColumnFunction count(Object obj) {
+        return new QueryColumnFunction(SqlConstant.COUNT, obj);
     }
 
     /**
      * 将字符串 s1，s2 等多个字符串合并为一个字符串。
      */
-    public static QueryColumnFunction concat(Object... objects) {
-        return new QueryColumnFunction(SqlConstant.CONCAT, objects);
-    }
-
-    /**
-     * 将字符串 s1，s2 等多个字符串合并为一个字符串。
-     */
-    public static QueryColumnFunction concat(IQueryColumn queryColumnS1, IQueryColumn queryColumnS2, IQueryColumn... columnN) {
-        return new QueryColumnFunction(SqlConstant.CONCAT, ArrayUtil.addAll(new IQueryColumn[]{queryColumnS1, queryColumnS2}, columnN));
-    }
-
-    /**
-     * 计算两个时间相差天数
-     */
-    public static QueryColumnFunction dateDiff(IQueryColumn queryColumn1, IQueryColumn queryColumn2) {
-        return new QueryColumnFunction(SqlConstant.DATEDIFF, queryColumn1, queryColumn2);
+    public static QueryColumnFunction concat(Object obj1, Object obj2, Object... objs) {
+        return new QueryColumnFunction(SqlConstant.CONCAT, ArrayUtil.addAll(new Object[]{obj1, obj2}, objs));
     }
 
     /**
      * 计算两个时间相差天数
      */
-    public static QueryColumnFunction dateDiff(IQueryColumn queryColumn1, String queryColumn2) {
-        return new QueryColumnFunction(SqlConstant.DATEDIFF, queryColumn1, string(queryColumn2));
-    }
-
-    /**
-     * 日期格式
-     */
-    public static QueryColumnFunction dateFormat(IQueryColumn queryColumn, String format) {
-        return new QueryColumnFunction(SqlConstant.DATE_FORMAT, queryColumn, string(format));
+    public static QueryColumnFunction dateDiff(Object obj1, Object obj2) {
+        return new QueryColumnFunction(SqlConstant.DATEDIFF, obj1, obj2);
     }
 
     /**
      * 日期格式
      */
-    public static QueryColumnFunction dateFormat(String queryColumn, String format) {
-        return new QueryColumnFunction(SqlConstant.DATE_FORMAT, string(queryColumn), string(format));
+    public static QueryColumnFunction dateFormat(Object obj1, Object obj2) {
+        return new QueryColumnFunction(SqlConstant.DATE_FORMAT, obj1, obj2);
     }
 
     /**
      * 判断值是否为null
      */
-    public static QueryColumnFunction ifNull(IQueryColumn nullColumn, IQueryColumn elseColumn) {
-        return new QueryColumnFunction(SqlConstant.IFNULL, nullColumn, elseColumn);
-    }
-
-    /**
-     * 判断值是否为null
-     */
-    public static QueryColumnFunction ifNull(String nullColumn, String elseColumn) {
-        return new QueryColumnFunction(SqlConstant.IFNULL, new RawQueryColumn(nullColumn), new RawQueryColumn(elseColumn));
+    public static QueryColumnFunction ifNull(Object obj1, Object obj2) {
+        return new QueryColumnFunction(SqlConstant.IFNULL, obj1, obj2);
     }
 
     /**
@@ -109,29 +81,29 @@ public class QueryMethods {
     /**
      * 替换字符串
      */
-    public static QueryColumnFunction replace(IQueryColumn queryColumn, String fromColumn, String toColumn) {
-        return new QueryColumnFunction(SqlConstant.REPLACE, queryColumn, string(fromColumn), string(toColumn));
+    public static QueryColumnFunction replace(IQueryColumn queryColumn, Object obj1, Object obj2) {
+        return new QueryColumnFunction(SqlConstant.REPLACE, queryColumn, obj1, obj2);
     }
 
     /**
      * 四舍五入
      */
     public static QueryColumnFunction round(IQueryColumn queryColumn, Number number) {
-        return new QueryColumnFunction(SqlConstant.ROUND, queryColumn, number(number));
+        return new QueryColumnFunction(SqlConstant.ROUND, queryColumn, number);
     }
 
     /**
      * 截取字符串
      */
     public static QueryColumnFunction substr(IQueryColumn queryColumn, int position) {
-        return new QueryColumnFunction(SqlConstant.SUBSTR, queryColumn, number(position));
+        return new QueryColumnFunction(SqlConstant.SUBSTR, queryColumn, position);
     }
 
     /**
      * 截取字符串
      */
     public static QueryColumnFunction substr(IQueryColumn queryColumn, int position, int length) {
-        return new QueryColumnFunction(SqlConstant.SUBSTR, queryColumn, number(position), number(length));
+        return new QueryColumnFunction(SqlConstant.SUBSTR, queryColumn, position, length);
     }
 
     /**
@@ -162,18 +134,4 @@ public class QueryMethods {
         return new QueryColumnFunction(SqlConstant.HOUR, queryColumn);
     }
 
-    /**
-     * 构建数字常量。
-     */
-    public static RawQueryColumn number(Number n) {
-        return new RawQueryColumn(n);
-    }
-
-    /**
-     * 构建字符常量。
-     */
-    public static RawQueryColumn string(String s) {
-        return new RawQueryColumn("'" + s + "'");
-    }
-
 }

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

@@ -14,6 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import java.util.List;
 
 import static org.example.join.domain.QueryMethods.concat;
+import static org.example.join.domain.QueryMethods.now;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = DromaraApplication.class)
@@ -45,6 +46,7 @@ public class MySpringBootTest {
                         //abs(parent_id).as(SysDept::getUpdateTime),
                         //replace(dept_id, "2", "3"),
                         //concat("@", "1"),
+                        now(),
                         concat(dept_id, 1, "',(select config_value from sys_config where config_id = 1749335361951907842),'").as(SysDept::getEmail)
                         //concat(dept_id, parent_id),
                         //concat(dept_id,"sdasdsa"),