diff --git a/tang-tool/tang-generator/src/main/java/com/tang/generator/utils/VelocityUtils.java b/tang-tool/tang-generator/src/main/java/com/tang/generator/utils/VelocityUtils.java index 9239ae26..ef83f84e 100644 --- a/tang-tool/tang-generator/src/main/java/com/tang/generator/utils/VelocityUtils.java +++ b/tang-tool/tang-generator/src/main/java/com/tang/generator/utils/VelocityUtils.java @@ -45,6 +45,7 @@ import static com.tang.generator.constants.VmTemplate.VM_VUE_INDEX_TS; import static com.tang.generator.constants.VmTemplate.VM_VUE_TYPES; import static com.tang.generator.constants.VmTemplate.VM_XML_MYBATIS_MAPPER; +import static com.tang.generator.constants.VmTemplate.VM_XML_MYBATIS_FLEX_MAPPER; import static com.tang.generator.constants.VmTemplate.VM_XML_MYBATIS_PLUS_MAPPER; /** @@ -236,7 +237,7 @@ private static List getJavaTemplateList(LanguageType languageType, OrmTy return switch (languageType) { case JAVA -> switch (ormType) { case MYBATIS -> List.of(VM_JAVA_MYBATIS_ENTITY, VM_JAVA_MYBATIS_MAPPER, VM_JAVA_MYBATIS_SERVICE, VM_JAVA_MYBATIS_SERVICE_IMPL, VM_JAVA_MYBATIS_CONTROLLER, VM_XML_MYBATIS_MAPPER); - case MYBATIS_FLEX -> List.of(VM_JAVA_MYBATISFLEX_ENTITY, VM_JAVA_MYBATISFLEX_MAPPER, VM_JAVA_MYBATISFLEX_SERVICE, VM_JAVA_MYBATISFLEX_SERVICE_IMPL, VM_JAVA_MYBATISFLEX_CONTROLLER); + case MYBATIS_FLEX -> List.of(VM_JAVA_MYBATISFLEX_ENTITY, VM_JAVA_MYBATISFLEX_MAPPER, VM_JAVA_MYBATISFLEX_SERVICE, VM_JAVA_MYBATISFLEX_SERVICE_IMPL, VM_JAVA_MYBATISFLEX_CONTROLLER, VM_XML_MYBATIS_FLEX_MAPPER); case MYBATIS_PLUS -> List.of(VM_JAVA_MYBATIS_PLUS_ENTITY, VM_JAVA_MYBATIS_PLUS_MAPPER, VM_JAVA_MYBATIS_PLUS_SERVICE, VM_JAVA_MYBATIS_PLUS_SERVICE_IMPL, VM_JAVA_MYBATIS_PLUS_CONTROLLER, VM_XML_MYBATIS_PLUS_MAPPER); default -> Collections.emptyList(); }; @@ -285,7 +286,7 @@ public static String getFileName(String template, GenTable table) { case VM_KOTLIN_MYBATIS_SERVICE -> format("{}/service/{}Service.kt", kotlinPath, className); case VM_KOTLIN_MYBATIS_SERVICE_IMPL -> format("{}/service/impl/{}ServiceImpl.kt", kotlinPath, className); case VM_KOTLIN_MYBATIS_CONTROLLER -> format("{}/controller/{}Controller.kt", kotlinPath, className); - case VM_XML_MYBATIS_MAPPER, VM_XML_MYBATIS_PLUS_MAPPER -> format("{}/{}Mapper.xml", mybatisPath, className); + case VM_XML_MYBATIS_MAPPER, VM_XML_MYBATIS_FLEX_MAPPER, VM_XML_MYBATIS_PLUS_MAPPER -> format("{}/{}Mapper.xml", mybatisPath, className); case VM_VUE_INDEX -> format("{}/{}/index.vue", vuePath, businessName); case VM_VUE_INDEX_TS -> format("{}/{}/index.ts", apiPath, businessName); case VM_VUE_TYPES -> format("{}/{}/types.ts", apiPath, businessName); diff --git a/tang-tool/tang-generator/src/main/kotlin/com/tang/generator/constants/VmTemplate.kt b/tang-tool/tang-generator/src/main/kotlin/com/tang/generator/constants/VmTemplate.kt index 9ce4b347..c339c6a5 100644 --- a/tang-tool/tang-generator/src/main/kotlin/com/tang/generator/constants/VmTemplate.kt +++ b/tang-tool/tang-generator/src/main/kotlin/com/tang/generator/constants/VmTemplate.kt @@ -49,6 +49,8 @@ object VmTemplate { const val VM_XML_MYBATIS_MAPPER = "vm/xml/mybatis/mapper.xml.vm" + const val VM_XML_MYBATIS_FLEX_MAPPER = "vm/xml/mybatisflex/mapper.xml.vm" + const val VM_XML_MYBATIS_PLUS_MAPPER = "vm/xml/mybatisplus/mapper.xml.vm" const val VM_VUE_INDEX = "vm/vue/index.vue.vm" diff --git a/tang-tool/tang-generator/src/main/resources/vm/xml/mybatisflex/mapper.xml.vm b/tang-tool/tang-generator/src/main/resources/vm/xml/mybatisflex/mapper.xml.vm new file mode 100644 index 00000000..ad9e7c4c --- /dev/null +++ b/tang-tool/tang-generator/src/main/resources/vm/xml/mybatisflex/mapper.xml.vm @@ -0,0 +1,16 @@ + + + + + +#foreach ($column in $columnList) + +#end + + + + select#foreach ($column in $columnList) ${tableAlias}.$column.columnName#if ($foreach.count != $columnList.size()),#end#end + from $tableName $tableAlias + + +