update service 统一使用 ServicePlusImpl

疯狂的狮子li

2021-07-28 5dbf39beeec75b2539c4636cf50e96d44b56fd3e

 ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -50,7 +50,7 @@
 */
@Slf4j
@Service
public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTable> implements IGenTableService {
public class GenTableServiceImpl extends ServicePlusImpl<GenTableMapper, GenTable, GenTable> implements IGenTableService {

    @Autowired
    private GenTableColumnMapper genTableColumnMapper;
@@ -137,14 +137,16 @@
            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
                genTableColumnMapper.update(cenTableColumn,
                        new LambdaUpdateWrapper<GenTableColumn>()
                                .set(cenTableColumn.getIsPk() == null, GenTableColumn::getIsPk, null)
                                .set(cenTableColumn.getIsIncrement() == null, GenTableColumn::getIsIncrement, null)
                                .set(cenTableColumn.getIsInsert() == null, GenTableColumn::getIsInsert, null)
                                .set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
                                .set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
                                .set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
                        .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
                                .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
                     .set(StrUtil.isBlank(cenTableColumn.getColumnComment()), GenTableColumn::getColumnComment, null)
                     .set(StrUtil.isBlank(cenTableColumn.getIsPk()), GenTableColumn::getIsPk, null)
                     .set(StrUtil.isBlank(cenTableColumn.getIsIncrement()), GenTableColumn::getIsIncrement, null)
                     .set(StrUtil.isBlank(cenTableColumn.getIsInsert()), GenTableColumn::getIsInsert, null)
                     .set(StrUtil.isBlank(cenTableColumn.getIsEdit()), GenTableColumn::getIsEdit, null)
                     .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.getDictType()), GenTableColumn::getDictType, "")
                     .eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
            }
        }
    }
@@ -182,9 +184,9 @@
                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
                    for (GenTableColumn column : genTableColumns) {
                        GenUtils.initColumnField(column, table);
                        genTableColumnMapper.insert(column);
                  genTableColumnMapper.insert(column);
                    }
                }
            }
            }
        } catch (Exception e) {
            throw new CustomException("导入失败：" + e.getMessage());
@@ -290,9 +292,9 @@
        dbTableColumns.forEach(column -> {
            if (!tableColumnNames.contains(column.getColumnName())) {
                GenUtils.initColumnField(column, table);
                genTableColumnMapper.insert(column);
            }
        });
            genTableColumnMapper.insert(column);
         }
      });

        List<GenTableColumn> delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList());
        if (CollUtil.isNotEmpty(delColumns)) {