更新快照.

changelog-temp.md

@@ -4,11 +4,13 @@
 - fix: 修正非通用泛型情况下序列化json减少强转
 - fix: 修复代码生成器禁用模板失效
 - fix: 修复分页count优化distinct搭配orderBy处理错误
+- fix: 修复达梦数据库生成代码错误
 - feat: BaseMapper新增批量操作与SaveOrUpdate方法
 - feat: BaseMapper新增批量操作方法返回值List<BatchResult>
 - feat: BaseMapper方法逻辑删除默认支持填充
 - feat: 调整Service层逻辑删除填充逻辑处理
 - feat: 自增自减处理BigDecimal
-- frat: 新增雪花ID配置（支持手动分配workerId与datacenterId或指定网卡信息自动获取方式）
+- feat: 新增雪花ID配置（支持手动分配workerId与datacenterId或指定网卡信息自动获取方式）
 - feat: SpringBoot依赖升级
 - feat: 升级kotlin-reflect至1.9.23
+- feat: 重构ServiceImpl泛型参数提取

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/DMQuery.java

@@ -34,7 +34,7 @@ public class DMQuery extends AbstractDbQuery {
             "  != 27 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 29 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 25 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT)\n" +
             "   != 12 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 7 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 21 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT)\n" +
             "    != 23 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 18 AND CAST((INFO3 & 0x00FF & 0x003F) AS INT) != 5)OR SUBTYPE$='VIEW' )) \n" +
-            "TABS WHERE TABS.SCHID = SCHEMAS.ID ) temp where 1=1";
+            "TABS WHERE TABS.SCHID = SCHEMAS.ID ) TEMP WHERE 1=1";
     }
 
     @Override

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/config/StrategyConfigTest.java

@@ -48,6 +48,35 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 class StrategyConfigTest {
 
+    @Test
+    void test() {
+        StrategyConfig strategyConfig;
+        // 默认全开
+        strategyConfig = new StrategyConfig.Builder().build();
+        Assertions.assertTrue(strategyConfig.controller().isGenerate());
+        Assertions.assertTrue(strategyConfig.entity().isGenerate());
+        Assertions.assertTrue(strategyConfig.service().isGenerateService());
+        Assertions.assertTrue(strategyConfig.service().isGenerateServiceImpl());
+        Assertions.assertTrue(strategyConfig.mapper().isGenerateMapper());
+        Assertions.assertTrue(strategyConfig.mapper().isGenerateMapperXml());
+        strategyConfig =
+            new StrategyConfig.Builder()
+                .entityBuilder()
+                .javaTemplate("/templates/entity.java")
+                .disable()
+                .serviceBuilder().disable()
+                .disableService().serviceTemplate("/templates/service.java").serviceImplTemplate("/templates/serviceImpl.java")
+                .mapperBuilder().disableMapper().disableMapperXml()
+                .controllerBuilder().disable().template("")
+                .build();
+        Assertions.assertFalse(strategyConfig.controller().isGenerate());
+        Assertions.assertFalse(strategyConfig.entity().isGenerate());
+        Assertions.assertFalse(strategyConfig.service().isGenerateService());
+        Assertions.assertFalse(strategyConfig.service().isGenerateServiceImpl());
+        Assertions.assertFalse(strategyConfig.mapper().isGenerateMapper());
+        Assertions.assertFalse(strategyConfig.mapper().isGenerateMapperXml());
+    }
+
     @Test
     void baseEntity() {
         StrategyConfig strategyConfig = GeneratorBuilder.strategyConfig();