From c53042a4b540b28861f1431215e48a58d681f721 Mon Sep 17 00:00:00 2001 From: lijiahangmax Date: Tue, 12 Aug 2025 23:28:30 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/generator/core/CodeGenerator.java | 6 ++++++ .../templates/orion-server-module-entity-do.java.vm | 2 ++ .../resources/templates/orion-vue-views-types-const.ts.vm | 2 +- .../templates/orion-vue-views-types-form.rules.ts.vm | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java index d2d0ec94..462ada82 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/org/dromara/visor/framework/mybatis/core/generator/core/CodeGenerator.java @@ -23,10 +23,12 @@ package org.dromara.visor.framework.mybatis.core.generator.core; import cn.orionsec.kit.lang.able.Executable; +import cn.orionsec.kit.lang.constant.Const; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.config.*; import com.baomidou.mybatisplus.generator.config.builder.CustomFile; +import com.baomidou.mybatisplus.generator.config.builder.Entity; import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; @@ -135,6 +137,10 @@ public class CodeGenerator implements Executable { // 整合注入配置 .injection(injectionConfig); + // 提前解析父类 并且排除父类的 id 字段 + Entity entity = strategyConfig.entity(); + entity.getSuperEntityColumns().remove(Const.ID); + // 执行 ag.execute(engine); } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm index 25166243..39ec31ca 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-do.java.vm @@ -60,6 +60,7 @@ public class ${entity} { #end ## ---------- BEGIN 字段循环遍历 ---------- #foreach($field in ${table.fields}) +#if("$!field.propertyName" != "id") #if(${field.keyFlag}) #set($keyPropertyName=${field.propertyName}) @@ -88,5 +89,6 @@ public class ${entity} { #end private ${field.propertyType} ${field.propertyName}; #end +#end } diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm index bf109351..c961baa6 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-const.ts.vm @@ -1,4 +1,4 @@ -export const TABLE_NAME = '$table.name'; +export const TableName = '$table.name'; #if($dictMap.entrySet().size() > 0) #foreach($enumEntity in $dictMap.entrySet()) diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm index ec72e63f..c59dbe55 100644 --- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm +++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-form.rules.ts.vm @@ -1,4 +1,5 @@ import type { FieldRule } from '@arco-design/web-vue'; + #foreach($field in ${table.fields}) #if("$!field.propertyName" != "id") #if(${field.propertyType} == 'String' && "$field.metaInfo.jdbcType" != "LONGVARCHAR")