xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-14 20:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
violateer
2025-08-10 17:22:48 +08:00
parent fa5ad8caf6 0f28e1f3f6
commit 86d7eab5b5
4 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/impl/GenTableServiceImpl.java
View File

@@ -95,6 +95,7 @@ public class GenTableServiceImpl implements IGenTableService {
log.warn("Schema不存在，表名: {}", tableName); log.warn("Schema不存在，表名: {}", tableName);
return; return;
} }
// 查询Schema字段信息 // 查询Schema字段信息
List<SchemaFieldVo> fields = schemaFieldService.queryListByTableName(tableName); List<SchemaFieldVo> fields = schemaFieldService.queryListByTableName(tableName);
if (CollUtil.isEmpty(fields)) { if (CollUtil.isEmpty(fields)) {
@@ -220,16 +221,6 @@ public class GenTableServiceImpl implements IGenTableService {
table.put("sub", false); table.put("sub", false);
table.put("tree", false); table.put("tree", false);
// 添加isSuperColumn方法
table.put("isSuperColumn", new Object() {
public boolean isSuperColumn(String javaField) {
// 定义超类字段（BaseEntity中的字段）
return "createBy".equals(javaField) || "createTime".equals(javaField)
|| "updateBy".equals(javaField) || "updateTime".equals(javaField)
|| "remark".equals(javaField) || "tenantId".equals(javaField);
}
});
context.put("table", table); context.put("table", table);
// 处理字段信息 // 处理字段信息
@@ -439,16 +430,17 @@ public class GenTableServiceImpl implements IGenTableService {
return "String"; return "String";
} }
String type = dbType.toLowerCase(); String type = dbType.toLowerCase();
if (type.contains("int") || type.contains("tinyint") || type.contains("smallint")) { if (StrUtil.equalsAny(type, "int", "tinyint")) {
return "Integer"; return "Integer";
} else if (type.contains("bigint")) { } else if (StrUtil.equalsAny(type, "bigint")) {
return "Long"; return "Long";
} else if (type.contains("decimal") || type.contains("numeric") || type.contains("float") || type.contains( } else if (StrUtil.equalsAny(type, "decimal", "numeric", "float", "double")) {
"double")) {
return "BigDecimal"; return "BigDecimal";
} else if (type.contains("date") || type.contains("time")) { } else if (StrUtil.equalsAny(type, "date")) {
return "Date"; return "LocalDate";
} else if (type.contains("bit") || type.contains("boolean")) { } else if (StrUtil.equalsAny(type, "datetime", "timestamp")) {
return "LocalDateTime";
} else if (StrUtil.equalsAny(type, "bit", "boolean")) {
return "Boolean"; return "Boolean";
} else { } else {
return "String"; return "String";

12
ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/impl/SchemaFieldServiceImpl.java
View File

@@ -211,7 +211,6 @@ public class SchemaFieldServiceImpl implements SchemaFieldService {
result.put("tableName", schema.getTableName()); result.put("tableName", schema.getTableName());
result.put("tableComment", schema.getComment()); result.put("tableComment", schema.getComment());
result.put("className", toCamelCase(schema.getTableName(), true)); result.put("className", toCamelCase(schema.getTableName(), true));
// result.put("className", StrUtil.toCamelCase(schema.getTableName()));
result.put("tableCamelName", StrUtil.toCamelCase(schema.getTableName())); result.put("tableCamelName", StrUtil.toCamelCase(schema.getTableName()));
result.put("functionName", schema.getName()); result.put("functionName", schema.getName());
result.put("schemaName", schema.getName()); result.put("schemaName", schema.getName());
@@ -363,16 +362,15 @@ public class SchemaFieldServiceImpl implements SchemaFieldService {
} }
String type = dbType.toLowerCase(); String type = dbType.toLowerCase();
if (type.contains("int") || type.contains("tinyint") || type.contains("smallint")) { if (StrUtil.equalsAny(type, "int", "tinyint", "smallint")) {
return "Integer"; return "Integer";
} else if (type.contains("bigint")) { } else if (StrUtil.equalsAny(type, "bigint")) {
return "Long"; return "Long";
} else if (type.contains("decimal") || type.contains("numeric") || type.contains("float") || type.contains( } else if (StrUtil.equalsAny(type, "decimal", "numeric", "float", "double")) {
"double")) {
return "BigDecimal"; return "BigDecimal";
} else if (type.contains("date") || type.contains("time")) { } else if (StrUtil.equalsAny(type, "date", "datetime","timestamp")) {
return "Date"; return "Date";
} else if (type.contains("bit") || type.contains("boolean")) { } else if (StrUtil.equalsAny(type, "bit", "boolean")) {
return "Boolean"; return "Boolean";
} else { } else {
return "String"; return "String";

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@@ -25,11 +25,11 @@ import org.ruoyi.common.core.validate.EditGroup;
public class ${ClassName}Bo implements Serializable { public class ${ClassName}Bo implements Serializable {
#foreach ($column in $columns) #foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField) && ($column.isPk || $column.query || $column.insert || $column.edit)) #if($column.isPk || $column.query || $column.insert || $column.edit|| $column.required)
/** /**
* $column.columnComment * $column.columnComment
*/ */
#if($column.insert && $column.edit) #if(($column.insert && $column.edit) || $column.required)
#set($Group="AddGroup.class, EditGroup.class") #set($Group="AddGroup.class, EditGroup.class")
#elseif($column.insert) #elseif($column.insert)
#set($Group="AddGroup.class") #set($Group="AddGroup.class")

26
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@@ -1,22 +1,10 @@
package ${packageName}.domain; package ${packageName}.domain;
#foreach ($column in $columns)
#if($column.javaField=='tenantId')
#set($IsTenant=1)
#end
#end
#if($IsTenant==1)
import core.tenant.common.org.ruoyi.TenantEntity;
#else
#end
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; #foreach ($import in $importList)
#foreach ($import in $importList) import ${import};
import ${import}; #end
#end
import org.ruoyi.core.domain.BaseEntity;
/** /**
* ${functionName}对象 ${tableName} * ${functionName}对象 ${tableName}
@@ -24,15 +12,9 @@ import org.ruoyi.core.domain.BaseEntity;
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
#if($IsTenant==1)
#set($Entity="TenantEntity")
#else
#set($Entity="BaseEntity")
#end
@Data @Data
@EqualsAndHashCode(callSuper = true)
@TableName("${tableName}") @TableName("${tableName}")
public class ${ClassName} extends ${Entity} { public class ${ClassName} implements Serializable {
#foreach ($column in $columns) #foreach ($column in $columns)