Caratacus пре 6 година
родитељ
комит
7ad16f1a6b

+ 1 - 0
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Condition.java

@@ -17,6 +17,7 @@ package com.baomidou.mybatisplus.core.conditions;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 
 /**
 /**
  * <p>
  * <p>

+ 2 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/EmptyWrapper.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/EmptyWrapper.java

@@ -1,11 +1,11 @@
-package com.baomidou.mybatisplus.core.conditions;
+package com.baomidou.mybatisplus.core.conditions.query;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
 
 
 /**
 /**

+ 3 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrappers.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/Wrappers.java

@@ -1,7 +1,8 @@
-package com.baomidou.mybatisplus.core.conditions;
+package com.baomidou.mybatisplus.core.toolkit;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.EmptyWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -66,7 +67,7 @@ public class Wrappers implements Serializable {
      * @param <T>
      * @param <T>
      * @return
      * @return
      */
      */
-    public static <T> QueryWrapper<T> emptyQueryWrapper() {
+    public static <T> QueryWrapper<T> emptyWrapper() {
         return (QueryWrapper<T>) emptyWrapper;
         return (QueryWrapper<T>) emptyWrapper;
     }
     }
 }
 }

+ 69 - 0
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/IService.java

@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 
 
@@ -247,6 +248,17 @@ public interface IService<T> {
      */
      */
     int count(Wrapper<T> queryWrapper);
     int count(Wrapper<T> queryWrapper);
 
 
+    /**
+     * <p>
+     * 查询总记录数
+     * </p>
+     *
+     * @see Wrappers#emptyWrapper()
+     */
+    default int count() {
+        return count(Wrappers.<T>emptyWrapper());
+    }
+
     /**
     /**
      * <p>
      * <p>
      * 查询列表
      * 查询列表
@@ -256,6 +268,17 @@ public interface IService<T> {
      */
      */
     List<T> list(Wrapper<T> queryWrapper);
     List<T> list(Wrapper<T> queryWrapper);
 
 
+    /**
+     * <p>
+     * 查询所有
+     * </p>
+     *
+     * @see Wrappers#emptyWrapper()
+     */
+    default List<T> list() {
+        return list(Wrappers.<T>emptyWrapper());
+    }
+
     /**
     /**
      * <p>
      * <p>
      * 翻页查询
      * 翻页查询
@@ -266,6 +289,18 @@ public interface IService<T> {
      */
      */
     IPage<T> page(IPage<T> page, Wrapper<T> queryWrapper);
     IPage<T> page(IPage<T> page, Wrapper<T> queryWrapper);
 
 
+    /**
+     * <p>
+     * 无条件翻页查询
+     * </p>
+     *
+     * @param page 翻页对象
+     * @see Wrappers#emptyWrapper()
+     */
+    default IPage<T> page(IPage<T> page) {
+        return page(page, Wrappers.<T>emptyWrapper());
+    }
+
     /**
     /**
      * <p>
      * <p>
      * 查询列表
      * 查询列表
@@ -275,6 +310,17 @@ public interface IService<T> {
      */
      */
     List<Map<String, Object>> listMaps(Wrapper<T> queryWrapper);
     List<Map<String, Object>> listMaps(Wrapper<T> queryWrapper);
 
 
+    /**
+     * <p>
+     * 查询所有列表
+     * </p>
+     *
+     * @see Wrappers#emptyWrapper()
+     */
+    default List<Map<String, Object>> listMaps() {
+        return listMaps(Wrappers.<T>emptyWrapper());
+    }
+
     /**
     /**
      * <p>
      * <p>
      * 根据 Wrapper 条件,查询全部记录
      * 根据 Wrapper 条件,查询全部记录
@@ -284,6 +330,17 @@ public interface IService<T> {
      */
      */
     List<Object> listObjs(Wrapper<T> queryWrapper);
     List<Object> listObjs(Wrapper<T> queryWrapper);
 
 
+    /**
+     * <p>
+     * 查询全部记录
+     * </p>
+     *
+     * @see Wrappers#emptyWrapper()
+     */
+    default List<Object> listObjs() {
+        return listObjs(Wrappers.<T>emptyWrapper());
+    }
+
     /**
     /**
      * <p>
      * <p>
      * 翻页查询
      * 翻页查询
@@ -293,4 +350,16 @@ public interface IService<T> {
      * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
      * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
      */
      */
     IPage<Map<String, Object>> pageMaps(IPage<T> page, Wrapper<T> queryWrapper);
     IPage<Map<String, Object>> pageMaps(IPage<T> page, Wrapper<T> queryWrapper);
+
+    /**
+     * <p>
+     * 无条件翻页查询
+     * </p>
+     *
+     * @param page 翻页对象
+     * @see Wrappers#emptyWrapper()
+     */
+    default IPage<Map<String, Object>> pageMaps(IPage<T> page) {
+        return pageMaps(page, Wrappers.<T>emptyWrapper());
+    }
 }
 }