ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 08:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 重构查询列映射信息列表接口，支持对已保存的列映射配置同步最新表结构

Browse Source
This commit is contained in:
Charles7c
2023-08-09 23:19:47 +08:00
parent a76f47fbd8
commit a265a84f80
7 changed files with 100 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/entity/ColumnMappingDO.java
View File

@@ -23,6 +23,7 @@ import javax.validation.constraints.NotBlank;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.experimental.Accessors;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,9 +33,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.meta.Column;
import cn.hutool.setting.dialect.Props;
import cn.hutool.setting.dialect.PropsUtil;
import top.charles7c.cnadmin.common.constant.StringConsts;
import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
@@ -137,8 +140,14 @@ public class ColumnMappingDO implements Serializable {
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
public ColumnMappingDO(String tableName) {
this.tableName = tableName;
public ColumnMappingDO(@NonNull Column column) {
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConsts.SPACE)[0].toLowerCase();
boolean isRequired = !column.isPk() && !column.isNullable();
this.tableName = column.getTableName();
this.setColumnName(column.getName()).setColumnType(columnType).setComment(column.getComment())
.setIsRequired(isRequired).setShowInList(true).setShowInForm(isRequired).setShowInQuery(isRequired)
.setFormType(FormTypeEnum.TEXT);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.INNER_LIKE : QueryTypeEnum.EQUAL);
}
public ColumnMappingDO setColumnName(String columnName) {

4
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/GeneratorService.java
View File

@@ -64,9 +64,11 @@ public interface GeneratorService {
*
* @param tableName
* 表名称
* @param requireSync
* 是否需要同步
* @return 列映射信息列表
*/
List<ColumnMappingDO> listColumnMapping(String tableName);
List<ColumnMappingDO> listColumnMapping(String tableName, Boolean requireSync);
/**
* 保存代码生成配置信息

40
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java
View File

@@ -17,9 +17,11 @@
package top.charles7c.cnadmin.tool.service.impl;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.sql.DataSource;
@@ -38,12 +40,10 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.db.meta.Column;
import top.charles7c.cnadmin.common.constant.StringConsts;
import top.charles7c.cnadmin.common.enums.QueryTypeEnum;
import top.charles7c.cnadmin.common.model.query.PageQuery;
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
import top.charles7c.cnadmin.common.util.validate.CheckUtils;
import top.charles7c.cnadmin.tool.config.properties.GeneratorProperties;
import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
import top.charles7c.cnadmin.tool.mapper.ColumnMappingMapper;
import top.charles7c.cnadmin.tool.mapper.GenConfigMapper;
import top.charles7c.cnadmin.tool.model.entity.ColumnMappingDO;
@@ -113,22 +113,34 @@ public class GeneratorServiceImpl implements GeneratorService {
}
@Override
public List<ColumnMappingDO> listColumnMapping(String tableName) {
public List<ColumnMappingDO> listColumnMapping(String tableName, Boolean requireSync) {
List<ColumnMappingDO> columnMappingList = columnMappingMapper
.selectList(Wrappers.lambdaQuery(ColumnMappingDO.class).eq(ColumnMappingDO::getTableName, tableName));
if (CollUtil.isEmpty(columnMappingList)) {
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
columnMappingList = new ArrayList<>(columnList.size());
return columnList.stream().map(ColumnMappingDO::new).collect(Collectors.toList());
}
// 同步最新数据表列信息
if (requireSync) {
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
// 移除已不存在的列映射信息
List<String> columnNameList = columnList.stream().map(Column::getName).collect(Collectors.toList());
columnMappingList.removeIf(column -> !columnNameList.contains(column.getColumnName()));
// 新增或更新列映射信息
Map<String, ColumnMappingDO> columnMappingMap = columnMappingList.stream()
.collect(Collectors.toMap(ColumnMappingDO::getColumnName, Function.identity(), (key1, key2) -> key2));
for (Column column : columnList) {
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConsts.SPACE)[0];
boolean isRequired = !column.isPk() && !column.isNullable();
ColumnMappingDO columnMapping = new ColumnMappingDO(tableName).setColumnName(column.getName())
.setColumnType(columnType.toLowerCase()).setComment(column.getComment()).setIsRequired(isRequired)
.setShowInList(true).setShowInForm(isRequired).setShowInQuery(isRequired)
.setFormType(FormTypeEnum.TEXT);
columnMapping.setQueryType(
"String".equals(columnMapping.getFieldType()) ? QueryTypeEnum.INNER_LIKE : QueryTypeEnum.EQUAL);
columnMappingList.add(columnMapping);
ColumnMappingDO columnMapping = columnMappingMap.get(column.getName());
if (null != columnMapping) {
// 更新已有列映射信息
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConsts.SPACE)[0].toLowerCase();
columnMapping.setColumnType(columnType).setComment(column.getComment());
} else {
// 新增列映射信息
columnMapping = new ColumnMappingDO(column);
columnMappingList.add(columnMapping);
}
}
}
return columnMappingList;