升级通用Mapper和分页插件版本。

abel533 · abel533 · commit 1f6b9215583a · 2015-02-04T10:59:06.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -22,8 +22,8 @@
     <!--  编译jdk版本  -->
     <jdk.version>1.6</jdk.version>
     <!--  依赖版本  -->
-    <mapper.version>1.1.0</mapper.version>
-    <pagehelper.version>3.4.0</pagehelper.version>
+    <mapper.version>2.0.0</mapper.version>
+    <pagehelper.version>3.6.0</pagehelper.version>
     <mysql.version>5.1.29</mysql.version>
     <spring.version>4.1.2.RELEASE</spring.version>
   </properties>
@@ -181,7 +181,7 @@
     <dependency>
       <groupId>com.github.pagehelper</groupId>
       <artifactId>pagehelper</artifactId>
-      <version>3.5.1</version>
+      <version>${pagehelper.version}</version>
     </dependency>
     <!--通用Mapper-->
     <dependency>
diff --git a/src/main/java/com/isea533/mybatis/controller/demo/DemoController.java b/src/main/java/com/isea533/mybatis/controller/demo/DemoController.java
@@ -55,6 +55,7 @@ public List<Country> requestTest7(
             @RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize
     ) {
         demoService.test();
+        demoService.testEntityMapper();
         return demoService.selectPage(pageNum, pageSize);
     }
 }
diff --git a/src/main/java/com/isea533/mybatis/service/DemoService.java b/src/main/java/com/isea533/mybatis/service/DemoService.java
@@ -24,20 +24,25 @@
 
 package com.isea533.mybatis.service;
 
+import com.github.abel533.entity.EntityMapper;
 import com.github.abel533.mapper.Mapper;
 import com.isea533.mybatis.model.Country;
+import com.isea533.mybatis.model.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * @author liuzh
  */
 @Service
-public class DemoService extends BaseService<Country>{
+public class DemoService extends BaseService<Country> {
 
     @Autowired
     private Mapper<Country> countryMapper;
 
+    @Autowired
+    private EntityMapper entityMapper;
+
     public int save(Country country) {
         if (country == null) {
             throw new NullPointerException("保存的对象不能为空!");
@@ -51,9 +56,16 @@ public int save(Country country) {
         return super.save(country);
     }
 
-    public void test(){
+    public void test() {
         int result = countryMapper.selectCount(null);
         System.out.println(result);
     }
 
+    public void testEntityMapper(){
+        Country country = entityMapper.selectByPrimaryKey(Country.class, 100);
+        int count = entityMapper.count(new Country());
+        System.out.println(country.toString());
+        System.out.println(count);
+    }
+
 }
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
@@ -86,7 +86,11 @@
   </bean>
 
   <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-    <property name="basePackage" value="com.isea533.mybatis.mapper"/>
+    <property name="basePackage" value="com.isea533.mybatis.mapper,com.github.abel533.entity.mapper"/>
+  </bean>
+
+  <bean id="entityMapper" class="com.github.abel533.entity.EntityMapper" scope="prototype">
+    <constructor-arg ref="commonMapper"/>
   </bean>
 
   <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate" scope="prototype">
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -26,7 +26,7 @@
 jdbc.driverClass = com.mysql.jdbc.Driver
 jdbc.url = jdbc:mysql://localhost:3306/test
 jdbc.user = root
-jdbc.password =
+jdbc.password = jj
 
 #c3p0
 jdbc.maxPoolSize=50

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public List<Country> requestTest7(`
`55`	`55`	`@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize`
`56`	`56`	`) {`
`57`	`57`	`demoService.test();`
	`58`	`+ demoService.testEntityMapper();`
`58`	`59`	`return demoService.selectPage(pageNum, pageSize);`
`59`	`60`	`}`
`60`	`61`	`}`