dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-10-14 06:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 代码生成 创建更新时间被覆盖问题

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-12-09 13:34:14 +08:00
parent 3b433089e3
commit 4ce2fb53a8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
View File

@@ -106,7 +106,7 @@ public class GenTableServiceImpl implements IGenTableService {
.like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment())) .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
.between(params.get("beginTime") != null && params.get("endTime") != null, .between(params.get("beginTime") != null && params.get("endTime") != null,
"create_time", params.get("beginTime"), params.get("endTime")) "create_time", params.get("beginTime"), params.get("endTime"))
.orderByAsc("table_id"); .orderByDesc("update_time");
return wrapper; return wrapper;
} }
@@ -165,7 +165,8 @@ public class GenTableServiceImpl implements IGenTableService {
gen.setCreateTime(x.getCreateTime()); gen.setCreateTime(x.getCreateTime());
gen.setUpdateTime(x.getUpdateTime()); gen.setUpdateTime(x.getUpdateTime());
return gen; return gen;
}).toList(); }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed())
.toList();
IPage<GenTable> page = pageQuery.build(); IPage<GenTable> page = pageQuery.build();
page.setTotal(tables.size()); page.setTotal(tables.size());

8
ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java
View File

@@ -29,6 +29,8 @@ public class GenUtils {
genTable.setBusinessName(getBusinessName(genTable.getTableName())); genTable.setBusinessName(getBusinessName(genTable.getTableName()));
genTable.setFunctionName(replaceText(genTable.getTableComment())); genTable.setFunctionName(replaceText(genTable.getTableComment()));
genTable.setFunctionAuthor(GenConfig.getAuthor()); genTable.setFunctionAuthor(GenConfig.getAuthor());
genTable.setCreateTime(null);
genTable.setUpdateTime(null);
} }
/** /**
@@ -39,6 +41,8 @@ public class GenUtils {
// 统一转小写 避免有些数据库默认大写问题 如果需要特别书写方式 请在实体类增加注解标注别名 // 统一转小写 避免有些数据库默认大写问题 如果需要特别书写方式 请在实体类增加注解标注别名
String columnName = column.getColumnName().toLowerCase(); String columnName = column.getColumnName().toLowerCase();
column.setTableId(table.getTableId()); column.setTableId(table.getTableId());
column.setCreateTime(null);
column.setUpdateTime(null);
// 设置java字段名 // 设置java字段名
column.setJavaField(StringUtils.toCamelCase(columnName)); column.setJavaField(StringUtils.toCamelCase(columnName));
// 设置默认类型 // 设置默认类型
@@ -68,10 +72,6 @@ public class GenUtils {
if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) { if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsEdit(GenConstants.REQUIRE); column.setIsEdit(GenConstants.REQUIRE);
} }
// BO对象 默认是否必填勾选
if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
column.setIsRequired(GenConstants.REQUIRE);
}
// VO对象 默认返回勾选 // VO对象 默认返回勾选
if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) { if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
column.setIsList(GenConstants.REQUIRE); column.setIsList(GenConstants.REQUIRE);