From b47798ef198d725ec63800f73d3e7a3a61f7fdcd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 12 一月 2025 20:36:22 +0800
Subject: [PATCH] update 优化 无需多余set变量
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index d3f4dde..3729980 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -106,7 +106,7 @@
.like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
.between(params.get("beginTime") != null && params.get("endTime") != null,
"create_time", params.get("beginTime"), params.get("endTime"))
- .orderByAsc("table_id");
+ .orderByDesc("update_time");
return wrapper;
}
@@ -137,7 +137,7 @@
}
// 杩囨护骞惰浆鎹㈣〃鏍兼暟鎹�
List<GenTable> tables = tablesMap.values().stream()
- .filter(x -> !startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> {
if (CollUtil.isEmpty(tableNames)) {
return true;
@@ -162,26 +162,18 @@
GenTable gen = new GenTable();
gen.setTableName(x.getName());
gen.setTableComment(x.getComment());
- gen.setCreateTime(x.getCreateTime());
+ // postgresql鐨勮〃鍏冩暟鎹病鏈夊垱寤烘椂闂磋繖涓笢瑗�(濂藉钁�) 鍙兘new Date浠ｆ浛
+ gen.setCreateTime(ObjectUtil.defaultIfNull(x.getCreateTime(), new Date()));
gen.setUpdateTime(x.getUpdateTime());
return gen;
- }).toList();
+ }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed())
+ .toList();
IPage<GenTable> page = pageQuery.build();
page.setTotal(tables.size());
// 鎵嬪姩鍒嗛〉 set鏁版嵁
page.setRecords(CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables));
return TableDataInfo.build(page);
- }
-
- public static boolean startWithAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
- // 鍒ゆ柇鏄惁鏄互鎸囧畾瀛楃涓插紑澶�
- for (CharSequence searchCharSequence : searchCharSequences) {
- if (StringUtils.startsWithIgnoreCase(cs, searchCharSequence)) {
- return true;
- }
- }
- return false;
}
/**
@@ -202,7 +194,7 @@
}
List<Table<?>> tableList = tablesMap.values().stream()
- .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> tableNameSet.contains(x.getName())).toList();
if (CollUtil.isEmpty(tableList)) {
--
Gitblit v1.9.3