From 9fa664e5a87d5bb516786298c5e1e6f167b83bd0 Mon Sep 17 00:00:00 2001 From: dawn9117 Date: Wed, 9 Dec 2020 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=BB?= =?UTF-8?q?=E8=BE=91,=20=E5=BC=BA=E5=88=B6=E5=90=8C=E6=AD=A5=E8=A1=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenTableServiceImpl.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java index de5cc50f3..35de1375d 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java @@ -286,30 +286,10 @@ public class GenTableServiceImpl implements IGenTableService public void synchDb(String tableName) { GenTable table = genTableMapper.selectGenTableByName(tableName); - List tableColumns = table.getColumns(); - List tableColumnNames = tableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - - List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - if (StringUtils.isEmpty(dbTableColumns)) - { - throw new BusinessException("同步数据失败，原表结构不存在"); - } - List 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 delColumns = tableColumns.stream() - .filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); - if (StringUtils.isNotEmpty(delColumns)) - { - genTableColumnMapper.deleteGenTableColumns(delColumns); - } + genTableMapper.deleteGenTableByIds(new Long[]{table.getTableId()}); + genTableColumnMapper.deleteGenTableColumns(table.getColumns()); + List tableList = genTableMapper.selectDbTableListByNames(new String[]{tableName}); + importGenTable(tableList); } /**