Преглед на файлове

主键注解 I 改为 PK 方便理解,去掉 mapper 注解

hubin преди 8 години
родител
ревизия
07db6cbc10

+ 5 - 5
mybatis-plus/src/main/java/com/baomidou/framework/service/IService.java

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.plugins.Page;
  * @author hubin
  * @Date 2016-04-20
  */
-public interface IService<T, I> {
+public interface IService<T, PK> {
 
 	/**
 	 * <p>
@@ -73,7 +73,7 @@ public interface IService<T, I> {
 	 *            主键ID
 	 * @return boolean
 	 */
-	boolean deleteById(I id);
+	boolean deleteById(PK id);
 
 	/**
 	 * <p>
@@ -106,7 +106,7 @@ public interface IService<T, I> {
 	 *            主键ID列表
 	 * @return boolean
 	 */
-	boolean deleteBatchIds(List<I> idList);
+	boolean deleteBatchIds(List<PK> idList);
 
 	/**
 	 * <p>
@@ -176,7 +176,7 @@ public interface IService<T, I> {
 	 *            主键ID
 	 * @return T
 	 */
-	T selectById(I id);
+	T selectById(PK id);
 
 	/**
 	 * <p>
@@ -187,7 +187,7 @@ public interface IService<T, I> {
 	 *            主键ID列表
 	 * @return List<T>
 	 */
-	List<T> selectBatchIds(List<I> idList);
+	List<T> selectBatchIds(List<PK> idList);
 
 	/**
 	 * <p>

+ 1 - 3
mybatis-plus/src/main/java/com/baomidou/framework/service/impl/CommonServiceImpl.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.framework.service.impl;
 
-import com.baomidou.mybatisplus.mapper.CommonMapper;
-
 /**
  * <p>
  * 主键 String 类型 IService 实现类( 泛型:M 是 mapper 对象, T 是实体 )
@@ -25,6 +23,6 @@ import com.baomidou.mybatisplus.mapper.CommonMapper;
  * @author hubin
  * @Date 2016-04-20
  */
-public class CommonServiceImpl<M extends CommonMapper<T>, T> extends ServiceImpl<M, T, String> {
+public class CommonServiceImpl<T> extends ServiceImpl<T, String> {
 
 }

+ 8 - 7
mybatis-plus/src/main/java/com/baomidou/framework/service/impl/ServiceImpl.java

@@ -15,6 +15,7 @@
  */
 package com.baomidou.framework.service.impl;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -27,16 +28,16 @@ import com.baomidou.mybatisplus.plugins.Page;
 
 /**
  * <p>
- * IService 实现类( 泛型:M 是 mapper 对象, T 是实体 , I 是主键泛型 )
+ * IService 实现类( 泛型:T 是实体 , PK 是主键泛型 )
  * </p>
  *
  * @author hubin
  * @Date 2016-04-20
  */
-public class ServiceImpl<M extends BaseMapper<T, I>, T, I> implements IService<T, I> {
+public class ServiceImpl<T, PK extends Serializable> implements IService<T, PK> {
 
     @Autowired
-    protected M baseMapper;
+    protected BaseMapper<T, PK> baseMapper;
 
     /**
      * 判断数据库操作是否成功
@@ -60,7 +61,7 @@ public class ServiceImpl<M extends BaseMapper<T, I>, T, I> implements IService<T
         return retBool(baseMapper.insertBatch(entityList));
     }
 
-    public boolean deleteById(I id) {
+    public boolean deleteById(PK id) {
         return retBool(baseMapper.deleteById(id));
     }
 
@@ -72,7 +73,7 @@ public class ServiceImpl<M extends BaseMapper<T, I>, T, I> implements IService<T
         return retBool(baseMapper.deleteSelective(entity));
     }
 
-    public boolean deleteBatchIds(List<I> idList) {
+    public boolean deleteBatchIds(List<PK> idList) {
         return retBool(baseMapper.deleteBatchIds(idList));
     }
 
@@ -96,11 +97,11 @@ public class ServiceImpl<M extends BaseMapper<T, I>, T, I> implements IService<T
         return retBool(baseMapper.updateBatchById(entityList));
     }
 
-    public T selectById(I id) {
+    public T selectById(PK id) {
         return baseMapper.selectById(id);
     }
 
-    public List<T> selectBatchIds(List<I> idList) {
+    public List<T> selectBatchIds(List<PK> idList) {
         return baseMapper.selectBatchIds(idList);
     }
 

+ 1 - 3
mybatis-plus/src/main/java/com/baomidou/framework/service/impl/SuperServiceImpl.java

@@ -15,8 +15,6 @@
  */
 package com.baomidou.framework.service.impl;
 
-import com.baomidou.mybatisplus.mapper.AutoMapper;
-
 /**
  * <p>
  * 主键 Long 类型 IService 实现类( 泛型:M 是 mapper 对象, T 是实体 )
@@ -25,6 +23,6 @@ import com.baomidou.mybatisplus.mapper.AutoMapper;
  * @author hubin
  * @Date 2016-04-20
  */
-public class SuperServiceImpl<M extends AutoMapper<T>, T> extends ServiceImpl<M, T, Long> {
+public class SuperServiceImpl<T> extends ServiceImpl<T, Long> {
 
 }

+ 6 - 5
mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/BaseMapper.java

@@ -15,6 +15,7 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +33,7 @@ import org.apache.ibatis.session.RowBounds;
  * @author hubin
  * @Date 2016-01-23
  */
-public interface BaseMapper<T, I> {
+public interface BaseMapper<T, PK extends Serializable> {
 
 	/**
 	 * <p>
@@ -74,7 +75,7 @@ public interface BaseMapper<T, I> {
 	 * 			主键ID
 	 * @return int
 	 */
-	int deleteById( I id );
+	int deleteById( PK id );
 
 
 	/**
@@ -107,7 +108,7 @@ public interface BaseMapper<T, I> {
 	 * 				主键ID列表
 	 * @return int
 	 */
-	int deleteBatchIds( List<I> idList );
+	int deleteBatchIds( List<PK> idList );
 
 
 	/**
@@ -174,7 +175,7 @@ public interface BaseMapper<T, I> {
 	 * 			主键ID
 	 * @return T
 	 */
-	T selectById( I id );
+	T selectById( PK id );
 
 
 	/**
@@ -185,7 +186,7 @@ public interface BaseMapper<T, I> {
 	 * 				主键ID列表
 	 * @return List<T>
 	 */
-	List<T> selectBatchIds( List<I> idList );
+	List<T> selectBatchIds( List<PK> idList );
 	
 	
 	/**