mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理数据表结构同步问题

This commit is contained in:
TinyAnts 2022-08-12 11:59:27 +08:00
parent 1cf0e277e8
commit 318107dbd7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java
View File

@ -286,19 +286,22 @@ public class GenerateServiceImpl implements IGenerateService {
@Override @Override
@Transactional @Transactional
public void syncTable(Integer id) { public void syncTable(Integer id) {
// 原表数据 // 生成的数据
GenTable genTable = genTableMapper.selectById(id); GenTable genTable = genTableMapper.selectById(id);
Assert.notNull(genTable, "生成数据不存在！");
// 旧表的数据
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectList( List<GenTableColumn> genTableColumns = genTableColumnMapper.selectList(
new QueryWrapper<GenTableColumn>() new QueryWrapper<GenTableColumn>()
.eq("table_id", id) .eq("table_id", id)
.orderByAsc("sort")); .orderByAsc("sort"));
Assert.isFalse(StringUtil.isEmpty(genTableColumns), "旧数据异常！");
Assert.isFalse(StringUtil.isEmpty(genTableColumns), "原表数据异常！");
// 原表转Map // 原表转Map
Map<String, GenTableColumn> tableColumnMap = genTableColumns Map<String, GenTableColumn> tableColumnMap = genTableColumns
.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); .stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
// 新表数据 // 新表数据
List<GenTableColumn> columns = genTableMapper.selectDbTableColumnsByName(genTable.getTableName()); List<GenTableColumn> columns = genTableMapper.selectDbTableColumnsByName(genTable.getTableName());
if (StringUtil.isNull(columns)) { if (StringUtil.isNull(columns)) {
@ -318,8 +321,8 @@ public class GenerateServiceImpl implements IGenerateService {
} }
if (prevColumn.getIsRequired() == 1 if (prevColumn.getIsRequired() == 1
&& column.getIsPk() == 0 && prevColumn.getIsPk() == 0
&& (column.getIsInsert() == 1 || column.getIsEdit() == 1)) { && (prevColumn.getIsInsert() == 1 || prevColumn.getIsEdit() == 1)) {
column.setHtmlType(prevColumn.getHtmlType()); column.setHtmlType(prevColumn.getHtmlType());
column.setIsRequired(prevColumn.getIsRequired()); column.setIsRequired(prevColumn.getIsRequired());
} }