3.0.1-SNAPSHOT 走起！！

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/activerecord/Model.java

@@ -97,7 +97,7 @@ public abstract class Model<T extends Model> implements Serializable {
         if (StringUtils.checkValNull(pkVal())) {
             throw new MybatisPlusException("deleteById primaryKey is null.");
         }
-        return deleteById(this.pkVal());
+        return deleteById(pkVal());
     }
 
     /**
@@ -126,7 +126,7 @@ public abstract class Model<T extends Model> implements Serializable {
             throw new MybatisPlusException("updateById primaryKey is null.");
         }
         // updateById
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(1);
         map.put("et", this);
         return SqlHelper.retBool(sqlSession().update(sqlStatement(SqlMethod.UPDATE_BY_ID), map));
     }
@@ -141,7 +141,7 @@ public abstract class Model<T extends Model> implements Serializable {
      */
     @Transactional(rollbackFor = Exception.class)
     public boolean update(Wrapper wrapper) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(2);
         map.put("et", this);
         map.put("ew", wrapper);
         // update
@@ -182,7 +182,7 @@ public abstract class Model<T extends Model> implements Serializable {
         if (StringUtils.checkValNull(pkVal())) {
             throw new MybatisPlusException("selectById primaryKey is null.");
         }
-        return selectById(this.pkVal());
+        return selectById(pkVal());
     }
 
     /**
@@ -195,7 +195,7 @@ public abstract class Model<T extends Model> implements Serializable {
      */
 
     public List<T> selectList(Wrapper wrapper) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(1);
         map.put("ew", wrapper);
         return sqlSession().selectList(sqlStatement(SqlMethod.SELECT_LIST), map);
     }
@@ -222,12 +222,9 @@ public abstract class Model<T extends Model> implements Serializable {
      * @return
      */
     public IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper) {
-        Map<String, Object> map = new HashMap<>();
-        wrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, wrapper);
-        map.put("ew", wrapper);
-        // TODO 待完成
-//        List<T> tl = sqlSession().selectList(sqlStatement(SqlMethod.SELECT_PAGE), map, page);
-//        page.setRecords(tl);
+        Map<String, Object> map = new HashMap<>(1);
+        map.put("ew", SqlHelper.fillWrapper(page, wrapper));
+        page.setRecords(sqlSession().selectList(sqlStatement(SqlMethod.SELECT_PAGE), map));
         return page;
     }
 
@@ -240,7 +237,7 @@ public abstract class Model<T extends Model> implements Serializable {
      * @return
      */
     public int selectCount(Wrapper wrapper) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(1);
         map.put("ew", wrapper);
         return SqlHelper.retCount(sqlSession().<Integer>selectOne(sqlStatement(SqlMethod.SELECT_COUNT), map));
     }

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

@@ -262,10 +262,11 @@ public interface IService<T> {
      * 翻页查询
      * </p>
      *
-     * @param page 翻页对象
+     * @param page    翻页对象
+     * @param wrapper 实体包装类 {@link Wrapper}
      * @return
      */
-    IPage<T> selectPage(IPage<T> page);
+    IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper);
 
     /**
      * <p>
@@ -296,18 +297,6 @@ public interface IService<T> {
      * @param wrapper {@link Wrapper}
      * @return
      */
-    @SuppressWarnings("rawtypes")
     IPage<Map<String, Object>> selectMapsPage(IPage page, Wrapper<T> wrapper);
 
-    /**
-     * <p>
-     * 翻页查询
-     * </p>
-     *
-     * @param page    翻页对象
-     * @param wrapper 实体包装类 {@link Wrapper}
-     * @return
-     */
-    IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper);
-
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java

@@ -171,32 +171,13 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean insertOrUpdateBatch(List<T> entityList, int batchSize) {
-        return insertOrUpdateBatch(entityList, batchSize, true);
-    }
-
-    /**
-     * 批量插入修改
-     *
-     * @param entityList 实体对象列表
-     * @param batchSize  批量刷新个数
-     * @param selective  是否滤掉空字段
-     * @return boolean
-     */
-    private boolean insertOrUpdateBatch(List<T> entityList, int batchSize, boolean selective) {
         if (CollectionUtils.isEmpty(entityList)) {
             throw new IllegalArgumentException("Error: entityList must not be empty");
         }
         try (SqlSession batchSqlSession = sqlSessionBatch()) {
             int size = entityList.size();
             for (int i = 0; i < size; i++) {
-                if (selective) {
-                    insertOrUpdate(entityList.get(i));
-                } else {
-                    //insertOrUpdateAllColumn(entityList.get(i));
-                }
-                if (i >= 1 && i % batchSize == 0) {
-                    batchSqlSession.flushStatements();
-                }
+                insertOrUpdate(entityList.get(i));
             }
             batchSqlSession.flushStatements();
         } catch (Throwable e) {
@@ -315,10 +296,9 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     }
 
     @Override
-    public IPage<T> selectPage(IPage<T> page) {
-        //TODO 3.0
-
-        return null;//selectPage(page, Wrapper.<T>getInstance());
+    public IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper) {
+        wrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, wrapper);
+        return baseMapper.selectPage(page, wrapper);
     }
 
     @Override
@@ -336,10 +316,4 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
         wrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, wrapper);
         return baseMapper.selectMapsPage(page, wrapper);
     }
-
-    @Override
-    public IPage<T> selectPage(IPage<T> page, Wrapper<T> wrapper) {
-        wrapper = (Wrapper<T>) SqlHelper.fillWrapper(page, wrapper);
-        return baseMapper.selectPage(page, wrapper);
-    }
 }