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

style: 优化全局代码格式

Browse Source
This commit is contained in:
Charles7c
2024-01-10 22:08:45 +08:00
parent 4fefdc75c2
commit 35e31233c5
97 changed files with 861 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java
View File

@@ -35,8 +35,7 @@ public interface FieldConfigMapper extends BaseMapper<FieldConfigDO> {
/**
* 根据表名称查询
*
* @param tableName
* 表名称
* @param tableName 表名称
* @return 字段配置信息
*/
@Select("SELECT * FROM `gen_field_config` WHERE `table_name` = #{tableName}")

4
continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java
View File

@@ -136,8 +136,8 @@ public class FieldConfigDO implements Serializable {
/**
* 查询方式
*/
@Schema(description = "查询方式", type = "Integer",
allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14"}, example = "1")
@Schema(description = "查询方式", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9",
"10", "11", "12", "13", "14"}, example = "1")
private QueryTypeEnum queryType;
/**

3
continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/GenConfigDO.java
View File

@@ -144,7 +144,8 @@ public class GenConfigDO implements Serializable {
public String getClassNamePrefix() {
String rawClassName = StrUtil.isNotBlank(this.tablePrefix)
? StrUtil.removePrefix(this.tableName, this.tablePrefix) : this.tableName;
? StrUtil.removePrefix(this.tableName, this.tablePrefix)
: this.tableName;
return StrUtil.upperFirst(StrUtil.toCamelCase(rawClassName));
}
}

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

@@ -39,34 +39,27 @@ public interface GeneratorService {
/**
* 分页查询表信息列表
*
* @param query
* 查询条件
* @param pageQuery
* 分页查询条件
* @param query 查询条件
* @param pageQuery 分页查询条件
* @return 表信息分页列表
* @throws SQLException
* /
* @throws SQLException /
*/
PageResp<TableResp> pageTable(TableQuery query, PageQuery pageQuery) throws SQLException;
/**
* 查询生成配置信息
*
* @param tableName
* 表名称
* @param tableName 表名称
* @return 生成配置信息
* @throws SQLException
* /
* @throws SQLException /
*/
GenConfigDO getGenConfig(String tableName) throws SQLException;
/**
* 查询字段配置列表
*
* @param tableName
* 表名称
* @param requireSync
* 是否需要同步
* @param tableName 表名称
* @param requireSync 是否需要同步
* @return 字段配置列表
*/
List<FieldConfigDO> listFieldConfig(String tableName, Boolean requireSync);
@@ -74,18 +67,15 @@ public interface GeneratorService {
/**
* 保存代码生成配置信息
*
* @param req
* 代码生成配置信息
* @param tableName
* 表名称
* @param req 代码生成配置信息
* @param tableName 表名称
*/
void saveConfig(GenConfigReq req, String tableName);
/**
* 生成预览
*
* @param tableName
* 表名称
* @param tableName 表名称
* @return 预览信息
*/
List<GeneratePreviewResp> preview(String tableName);
@@ -93,8 +83,7 @@ public interface GeneratorService {
/**
* 生成代码
*
* @param tableName
* 表名称
* @param tableName 表名称
*/
void generate(String tableName);
}

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

@@ -86,17 +86,16 @@ public class GeneratorServiceImpl implements GeneratorService {
if (StrUtil.isNotBlank(tableName)) {
tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName));
}
tableList.removeIf(
table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties.getExcludeTables()));
CollUtil.sort(tableList,
Comparator.comparing(Table::getCreateTime)
.thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime()))
.reversed());
tableList.removeIf(table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties
.getExcludeTables()));
CollUtil.sort(tableList, Comparator.comparing(Table::getCreateTime)
.thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime()))
.reversed());
List<TableResp> tableRespList = BeanUtil.copyToList(tableList, TableResp.class);
PageResp<TableResp> pageResp = PageResp.build(pageQuery.getPage(), pageQuery.getSize(), tableRespList);
for (TableResp tableResp : pageResp.getList()) {
long count = genConfigMapper.selectCount(
Wrappers.lambdaQuery(GenConfigDO.class).eq(GenConfigDO::getTableName, tableResp.getTableName()));
long count = genConfigMapper.selectCount(Wrappers.lambdaQuery(GenConfigDO.class)
.eq(GenConfigDO::getTableName, tableResp.getTableName()));
tableResp.setIsConfiged(count > 0);
}
return pageResp;
@@ -117,8 +116,9 @@ public class GeneratorServiceImpl implements GeneratorService {
genConfig.setBusinessName(StrUtil.replace(table.getComment(), "表", StringConstants.EMPTY));
}
// 默认作者名称（上次保存使用的作者名称）
GenConfigDO lastGenConfig = genConfigMapper.selectOne(
Wrappers.lambdaQuery(GenConfigDO.class).orderByDesc(GenConfigDO::getCreateTime).last("LIMIT 1"));
GenConfigDO lastGenConfig = genConfigMapper.selectOne(Wrappers.lambdaQuery(GenConfigDO.class)
.orderByDesc(GenConfigDO::getCreateTime)
.last("LIMIT 1"));
if (null != lastGenConfig) {
genConfig.setAuthor(lastGenConfig.getAuthor());
}
@@ -151,8 +151,8 @@ public class GeneratorServiceImpl implements GeneratorService {
FieldConfigDO fieldConfig = fieldConfigMap.get(column.getName());
if (null != fieldConfig) {
// 更新已有字段配置
String columnType =
StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase();
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0]
.toLowerCase();
fieldConfig.setColumnType(columnType);
fieldConfig.setColumnSize(column.getSize());
fieldConfig.setComment(column.getComment());
@@ -219,8 +219,8 @@ public class GeneratorServiceImpl implements GeneratorService {
Map<String, Object> genConfigMap = BeanUtil.beanToMap(genConfig);
genConfigMap.put("date", DateUtil.date().toString("yyyy/MM/dd HH:mm"));
String packageName = genConfig.getPackageName();
String apiModuleName =
StrUtil.subSuf(packageName, StrUtil.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
String apiModuleName = StrUtil.subSuf(packageName, StrUtil
.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
genConfigMap.put("apiModuleName", apiModuleName);
genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix()));
// 渲染后端代码
@@ -274,19 +274,20 @@ public class GeneratorServiceImpl implements GeneratorService {
// 例如：D:/continew-admin/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool
List<String> backendModuleChildPathList = CollUtil.newArrayList("src", "main", "java");
backendModuleChildPathList.addAll(StrUtil.split(packageName, StringConstants.DOT));
File backendParentFile =
FileUtil.file(backendModuleFile, backendModuleChildPathList.toArray(new String[0]));
File backendParentFile = FileUtil.file(backendModuleFile, backendModuleChildPathList
.toArray(new String[0]));
// 2.生成代码
List<GeneratePreviewResp> backendCodePreviewList =
generatePreviewList.stream().filter(GeneratePreviewResp::isBackend).collect(Collectors.toList());
List<GeneratePreviewResp> backendCodePreviewList = generatePreviewList.stream()
.filter(GeneratePreviewResp::isBackend)
.collect(Collectors.toList());
Map<String, TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
for (GeneratePreviewResp codePreview : backendCodePreviewList) {
// 例如：D:/continew-admin/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/XxxServiceImpl.java
TemplateConfig templateConfig =
templateConfigMap.get(codePreview.getFileName().replace(classNamePrefix, StringConstants.EMPTY)
.replace(FileNameUtil.EXT_JAVA, StringConstants.EMPTY));
File classParentFile = FileUtil.file(backendParentFile,
StrUtil.splitToArray(templateConfig.getPackageName(), StringConstants.DOT));
TemplateConfig templateConfig = templateConfigMap.get(codePreview.getFileName()
.replace(classNamePrefix, StringConstants.EMPTY)
.replace(FileNameUtil.EXT_JAVA, StringConstants.EMPTY));
File classParentFile = FileUtil.file(backendParentFile, StrUtil.splitToArray(templateConfig
.getPackageName(), StringConstants.DOT));
File classFile = new File(classParentFile, codePreview.getFileName());
// 如果已经存在，且不允许覆盖，则跳过
if (classFile.exists() && !isOverride) {
@@ -299,11 +300,12 @@ public class GeneratorServiceImpl implements GeneratorService {
if (StrUtil.isBlank(frontendPath)) {
return;
}
List<GeneratePreviewResp> frontendCodePreviewList =
generatePreviewList.stream().filter(p -> !p.isBackend()).collect(Collectors.toList());
List<GeneratePreviewResp> frontendCodePreviewList = generatePreviewList.stream()
.filter(p -> !p.isBackend())
.collect(Collectors.toList());
// 1.生成 api 代码
String apiModuleName =
StrUtil.subSuf(packageName, StrUtil.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
String apiModuleName = StrUtil.subSuf(packageName, StrUtil
.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
GeneratePreviewResp apiCodePreview = frontendCodePreviewList.get(0);
// 例如：D:/continew-admin-ui
List<String> frontendSubPathList = StrUtil.split(frontendPath, "src");
@@ -318,8 +320,8 @@ public class GeneratorServiceImpl implements GeneratorService {
// 2.生成 view 代码
GeneratePreviewResp viewCodePreview = frontendCodePreviewList.get(1);
// 例如：D:/continew-admin-ui/src/views/tool/xxx/index.vue
File indexFile =
FileUtil.file(frontendPath, apiModuleName, StrUtil.lowerFirst(classNamePrefix), "index.vue");
File indexFile = FileUtil.file(frontendPath, apiModuleName, StrUtil
.lowerFirst(classNamePrefix), "index.vue");
if (indexFile.exists() && !isOverride) {
return;
}
@@ -333,15 +335,13 @@ public class GeneratorServiceImpl implements GeneratorService {
/**
* 预处理生成配置
*
* @param genConfigMap
* 生成配置
* @param originFieldConfigList
* 原始字段配置列表
* @param templateConfigEntry
* 模板配置
* @param genConfigMap 生成配置
* @param originFieldConfigList 原始字段配置列表
* @param templateConfigEntry 模板配置
*/
private void pretreatment(Map<String, Object> genConfigMap, List<FieldConfigDO> originFieldConfigList,
Map.Entry<String, TemplateConfig> templateConfigEntry) {
private void pretreatment(Map<String, Object> genConfigMap,
List<FieldConfigDO> originFieldConfigList,
Map.Entry<String, TemplateConfig> templateConfigEntry) {
TemplateConfig templateConfig = templateConfigEntry.getValue();
// 移除需要忽略的字段
List<FieldConfigDO> fieldConfigList = originFieldConfigList.stream()
@@ -365,8 +365,8 @@ public class GeneratorServiceImpl implements GeneratorService {
genConfigMap.put("hasRequiredField", true);
}
QueryTypeEnum queryType = fieldConfig.getQueryType();
if (null != queryType && StrUtil.equalsAny(queryType.name(), QueryTypeEnum.IN.name(),
QueryTypeEnum.NOT_IN.name(), QueryTypeEnum.BETWEEN.name())) {
if (null != queryType && StrUtil.equalsAny(queryType.name(), QueryTypeEnum.IN.name(), QueryTypeEnum.NOT_IN
.name(), QueryTypeEnum.BETWEEN.name())) {
genConfigMap.put("hasListQueryField", true);
}
}