From 3aaf4e2384867c7900293063ed81450b0c965499 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 19 七月 2021 14:18:38 +0800
Subject: [PATCH] fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理)
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 1778910..9eceadf 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -142,8 +142,7 @@
.set(StrUtil.isBlank(cenTableColumn.getIsList()), GenTableColumn::getIsList, null)
.set(StrUtil.isBlank(cenTableColumn.getIsQuery()), GenTableColumn::getIsQuery, null)
.set(StrUtil.isBlank(cenTableColumn.getIsRequired()), GenTableColumn::getIsRequired, null)
- .set(StrUtil.isBlank(cenTableColumn.getQueryType()), GenTableColumn::getQueryType, null)
- .set(StrUtil.isBlank(cenTableColumn.getDictType()), GenTableColumn::getDictType, null)
+ .set(StrUtil.isBlank(cenTableColumn.getDictType()), GenTableColumn::getDictType, "")
.eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
@@ -180,14 +179,10 @@
if (row > 0) {
// 淇濆瓨鍒椾俊鎭�
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
- List<GenTableColumn> saveColumns = new ArrayList<>();
for (GenTableColumn column : genTableColumns) {
GenUtils.initColumnField(column, table);
- saveColumns.add(column);
+ genTableColumnMapper.insert(column);
}
- if (CollUtil.isNotEmpty(saveColumns)) {
- genTableColumnMapper.insertAll(saveColumns);
- }
}
}
} catch (Exception e) {
@@ -291,16 +286,12 @@
}
List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
- List<GenTableColumn> saveColumns = new ArrayList<>();
dbTableColumns.forEach(column -> {
if (!tableColumnNames.contains(column.getColumnName())) {
GenUtils.initColumnField(column, table);
- saveColumns.add(column);
+ genTableColumnMapper.insert(column);
}
});
- if (CollUtil.isNotEmpty(saveColumns)) {
- genTableColumnMapper.insertAll(saveColumns);
- }
List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(delColumns)) {
--
Gitblit v1.9.3