ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 优化 代码生成表名判断 使用开头判断避免误判

2.X
疯狂的狮子Li 2024-08-29 10:40:47 +08:00
parent f497b33e88
commit a35b32ef4d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ public class GenTableServiceImpl implements IGenTableService {
} }
// 过滤并转换表格数据 // 过滤并转换表格数据
List<GenTable> tables = tablesMap.values().stream() List<GenTable> tables = tablesMap.values().stream()
.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE)) .filter(x -> !startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> { .filter(x -> {
if (CollUtil.isEmpty(tableNames)) { if (CollUtil.isEmpty(tableNames)) {
return true; return true;
@ -149,11 +149,11 @@ public class GenTableServiceImpl implements IGenTableService {
boolean commentMatches = true; boolean commentMatches = true;
// 进行表名称的模糊查询 // 进行表名称的模糊查询
if (StringUtils.isNotBlank(tableName)) { if (StringUtils.isNotBlank(tableName)) {
nameMatches = StringUtils.startsWithIgnoreCase(x.getName(), tableName); nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName);
} }
// 进行表描述的模糊查询 // 进行表描述的模糊查询
if (StringUtils.isNotBlank(tableComment)) { if (StringUtils.isNotBlank(tableComment)) {
commentMatches = StringUtils.startsWithIgnoreCase(x.getComment(), tableComment); commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment);
} }
// 同时匹配名称和描述 // 同时匹配名称和描述
return nameMatches && commentMatches; return nameMatches && commentMatches;
@ -174,6 +174,16 @@ public class GenTableServiceImpl implements IGenTableService {
return TableDataInfo.build(page); 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;
}
/** /**
* 查询据库列表 * 查询据库列表
* *