随意优化

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -62,14 +62,18 @@ public class TableInfo implements Constants {
      * <p>true: 表示要进行 as</p>
      */
     private boolean keyRelated = false;
+    /**
+     * 表主键ID 字段名
+     */
+    private String keyColumn;
     /**
      * 表主键ID 属性名
      */
     private String keyProperty;
     /**
-     * 表主键ID 字段名
+     * 属性类型
      */
-    private String keyColumn;
+    private Class<?> keyType;
     /**
      * 表主键ID Sequence
      */
@@ -124,6 +128,7 @@ public class TableInfo implements Constants {
     public void setConfiguration(Configuration configuration) {
         Assert.notNull(configuration, "Error: You need Initialize MybatisConfiguration !");
         this.configuration = (MybatisConfiguration) configuration;
+        this.underCamel = configuration.isMapUnderscoreToCamelCase();
     }
 
     /**

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/TableInfoHelper.java

@@ -129,7 +129,6 @@ public class TableInfoHelper {
         if (null != builderAssistant) {
             tableInfo.setCurrentNamespace(builderAssistant.getCurrentNamespace());
             tableInfo.setConfiguration(builderAssistant.getConfiguration());
-            tableInfo.setUnderCamel(builderAssistant.getConfiguration().isMapUnderscoreToCamelCase());
             globalConfig = GlobalConfigUtils.getGlobalConfig(builderAssistant.getConfiguration());
         } else {
             // 兼容测试场景
@@ -340,7 +339,8 @@ public class TableInfoHelper {
                 }
                 tableInfo.setKeyRelated(checkRelated(underCamel, field.getName(), column))
                     .setKeyColumn(column)
-                    .setKeyProperty(field.getName());
+                    .setKeyProperty(field.getName())
+                    .setKeyType(field.getType());
                 return true;
             } else {
                 throwExceptionId(clazz);
@@ -370,7 +370,8 @@ public class TableInfoHelper {
                 tableInfo.setKeyRelated(checkRelated(tableInfo.isUnderCamel(), field.getName(), column))
                     .setIdType(dbConfig.getIdType())
                     .setKeyColumn(column)
-                    .setKeyProperty(field.getName());
+                    .setKeyProperty(field.getName())
+                    .setKeyType(field.getType());
                 return true;
             } else {
                 throwExceptionId(clazz);

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -233,59 +233,6 @@ class MysqlTestDataMapperTest extends BaseDbTest {
         assertTrue(CollectionUtils.isNotEmpty(mysqlDataPage.getRecords()));
         System.out.println(JSON.toJSONString(mysqlDataPage));
     }
-    //
-//    @Test
-//    void d7_selectPage() {
-//        Page<CommonData> page = new Page<>(1, 5);
-//        page.setDesc("c_time", "u_time");
-//        IPage<CommonData> dataPage = commonMapper.selectPage(page, null);
-//        Assertions.assertSame(dataPage, page);
-//        Assertions.assertNotEquals(0, dataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(dataPage));
-//        System.out.println(JSON.toJSON(dataPage.convert(CommonData::getId)));
-//
-//        Page<CommonData> commonDataPage = new Page<>(1, 5);
-//        commonDataPage.setDesc("c_time", "u_time");
-//        IPage<CommonData> commonDataDataPage = commonMapper.myPage(commonDataPage);
-//        Assertions.assertSame(commonDataDataPage, commonDataPage);
-//        Assertions.assertNotEquals(0, commonDataDataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonDataDataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(commonDataDataPage));
-//        System.out.println(JSON.toJSON(commonDataDataPage.convert(CommonData::getId)));
-//
-//        Page<CommonLogicData> logicPage = new Page<>(1, 5);
-//        IPage<CommonLogicData> logicDataPage = commonLogicDataMapper.selectPage(logicPage, null);
-//        Assertions.assertSame(logicDataPage, logicPage);
-//        Assertions.assertNotEquals(0, logicDataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(logicDataPage));
-//
-//        Page<MysqlData> mysqlPage = new Page<>(1, 5);
-//        IPage<MysqlData> mysqlDataPage = mysqlMapper.selectPage(mysqlPage, null);
-//        Assertions.assertSame(mysqlDataPage, mysqlPage);
-//        Assertions.assertNotEquals(0, mysqlDataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlDataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(mysqlDataPage));
-//
-//        Page<ResultMapEntity> resultMapEntityPage = new Page<>(1, 5);
-//        IPage<ResultMapEntity> resultMapEntityDataPage = resultMapEntityMapper.selectPage(resultMapEntityPage, null);
-//        Assertions.assertSame(resultMapEntityDataPage, resultMapEntityPage);
-//        Assertions.assertNotEquals(0, resultMapEntityDataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(resultMapEntityDataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(resultMapEntityDataPage));
-//    }
-//
-//    @Test
-//    void d7_arLambdaSelectPage() {
-//        Page<CommonData> page = new Page<>(1, 5);
-//        page.setDesc("c_time", "u_time");
-//        IPage<CommonData> dataPage = new CommonData().selectPage(page, new QueryWrapper<CommonData>().lambda());
-//        Assertions.assertSame(dataPage, page);
-//        Assertions.assertNotEquals(0, dataPage.getRecords().size());
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
-//        System.out.println(JSON.toJSONString(dataPage));
-//    }
 //
 //    @Test
 //    void d8_testApply() {