ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !236 from dawn9117/N/A

This commit is contained in:
dawn9117 2020-12-09 16:12:14 +08:00 committed by Gitee
parent ded17a552d 9fa664e5a8
commit 1520e39bd2
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java
View File

@ -286,30 +286,10 @@ public class GenTableServiceImpl implements IGenTableService
public void synchDb(String tableName) public void synchDb(String tableName)
{ {
GenTable table = genTableMapper.selectGenTableByName(tableName); GenTable table = genTableMapper.selectGenTableByName(tableName);
List<GenTableColumn> tableColumns = table.getColumns(); genTableMapper.deleteGenTableByIds(new Long[]{table.getTableId()});
List<String> tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); genTableColumnMapper.deleteGenTableColumns(table.getColumns());
List<GenTable> tableList = genTableMapper.selectDbTableListByNames(new String[]{tableName});
List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); importGenTable(tableList);
if (StringUtils.isEmpty(dbTableColumns))
{
throw new BusinessException("同步数据失败，原表结构不存在");
}
List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());
dbTableColumns.forEach(column -> {
if (!tableColumnNames.contains(column.getColumnName()))
{
GenUtils.initColumnField(column, table);
genTableColumnMapper.insertGenTableColumn(column);
}
});
List<GenTableColumn> delColumns = tableColumns.stream()
.filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
if (StringUtils.isNotEmpty(delColumns))
{
genTableColumnMapper.deleteGenTableColumns(delColumns);
}
} }
/** /**