From 51edb74474faf186367b867cc1b6ad3e76ff03bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 26 七月 2024 17:14:23 +0800
Subject: [PATCH] fix 修复 后端发消息发送失败无限重试问题
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 3fcd33f..cf9d2d0 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -63,6 +64,8 @@
private final GenTableColumnMapper genTableColumnMapper;
private final IdentifierGenerator identifierGenerator;
+ private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"};
+
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
*
@@ -120,12 +123,27 @@
// 鑾峰彇鏌ヨ鏉′欢
String tableName = genTable.getTableName();
String tableComment = genTable.getTableComment();
- // 鑾峰彇鍒嗛〉鍙傛暟
- Integer pageNum = pageQuery.getPageNum();
- Integer pageSize = pageQuery.getPageSize();
+ LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
+ if (CollUtil.isEmpty(tablesMap)) {
+ return TableDataInfo.build();
+ }
+ List<String> tableNames = baseMapper.selectTableNameList(genTable.getDataName());
+ String[] tableArrays;
+ if (CollUtil.isNotEmpty(tableNames)) {
+ tableArrays = tableNames.toArray(new String[0]);
+ } else {
+ tableArrays = new String[0];
+ }
// 杩囨护骞惰浆鎹㈣〃鏍兼暟鎹�
- List<GenTable> tables = ServiceProxy.metadata().tables().values().stream()
+ List<GenTable> tables = tablesMap.values().stream()
+ .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> {
+ if (CollUtil.isEmpty(tableNames)) {
+ return true;
+ }
+ return !StringUtils.containsAnyIgnoreCase(x.getName(), tableArrays);
+ })
.filter(x -> {
boolean nameMatches = true;
boolean commentMatches = true;
@@ -149,10 +167,10 @@
return gen;
}).toList();
- // 鍒涘缓鍒嗛〉瀵硅薄锛屽苟璁剧疆鎬昏褰曟暟
- IPage<GenTable> page = new Page<>(pageNum, pageSize, tables.size());
- // 浣跨敤CollUtil杩涜鍒嗛〉锛屽苟璁剧疆鍒嗛〉璁板綍
- page.setRecords(CollUtil.page(pageNum - 1, pageSize, tables));
+ 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);
}
@@ -167,9 +185,19 @@
@Override
public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
Set<String> tableNameSet = new HashSet<>(List.of(tableNames));
- List<Table> tableList = ServiceProxy.metadata().tables().values().stream()
+ LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
+
+ if (CollUtil.isEmpty(tablesMap)) {
+ return new ArrayList<>();
+ }
+
+ List<Table<?>> tableList = tablesMap.values().stream()
+ .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> tableNameSet.contains(x.getName())).toList();
+ if (ArrayUtil.isEmpty(tableList)) {
+ return new ArrayList<>();
+ }
return tableList.stream().map(x -> {
GenTable gen = new GenTable();
gen.setDataName(dataName);
@@ -265,7 +293,11 @@
*/
@DS("#dataName")
private List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
- LinkedHashMap<String, Column> columns = ServiceProxy.service().metadata().table(tableName).getColumns();
+ Table<?> table = ServiceProxy.metadata().table(tableName);
+ if (Objects.isNull(table)) {
+ return new ArrayList<>();
+ }
+ LinkedHashMap<String, Column> columns = table.getColumns();
List<GenTableColumn> tableColumns = new ArrayList<>();
columns.forEach((columnName, column) -> {
GenTableColumn tableColumn = new GenTableColumn();
@@ -274,8 +306,8 @@
tableColumn.setColumnComment(column.getComment());
tableColumn.setColumnType(column.getTypeName().toLowerCase());
tableColumn.setSort(column.getPosition());
-// tableColumn.setIsRequired();
-// tableColumn.setIsIncrement();
+ tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0");
+ tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1");
tableColumns.add(tableColumn);
});
return tableColumns;
--
Gitblit v1.9.3