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

refactor: 优化部分代码

Browse Source 
修复 Sonar 扫描问题
This commit is contained in:
Charles7c
2024-01-27 15:26:49 +08:00
parent d972a4466a
commit 03038d3b64
7 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,17 +143,15 @@ public class FieldConfigDO implements Serializable {
private LocalDateTime createTime;
public FieldConfigDO(@NonNull Column column) {
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase();
boolean isRequired = !column.isPk() && !column.isNullable();
this.tableName = column.getTableName();
this.setTableName(column.getTableName());
this.setColumnName(column.getName());
this.setColumnType(columnType);
this.setColumnType(StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase());
this.setColumnSize(column.getSize());
this.setComment(column.getComment());
this.setIsRequired(isRequired);
this.setIsRequired(!column.isPk() && !column.isNullable());
this.setShowInList(true);
this.setShowInForm(isRequired);
this.setShowInQuery(isRequired);
this.setShowInForm(this.getIsRequired());
this.setShowInQuery(this.getIsRequired());
this.setFormType(FormTypeEnum.TEXT);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.LIKE : QueryTypeEnum.EQ);
}

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

@@ -134,7 +134,7 @@ public class GeneratorServiceImpl implements GeneratorService {
return columnList.stream().map(FieldConfigDO::new).collect(Collectors.toList());
}
// 同步最新数据表列信息
if (requireSync) {
if (Boolean.TRUE.equals(requireSync)) {
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
// 移除已不存在的字段配置
List<String> columnNameList = columnList.stream().map(Column::getName).collect(Collectors.toList());
@@ -286,7 +286,7 @@ public class GeneratorServiceImpl implements GeneratorService {
.getPackageName(), StringConstants.DOT));
File classFile = new File(classParentFile, codePreview.getFileName());
// 如果已经存在，且不允许覆盖，则跳过
if (classFile.exists() && !isOverride) {
if (classFile.exists() && Boolean.FALSE.equals(isOverride)) {
continue;
}
FileUtil.writeUtf8String(codePreview.getContent(), classFile);
@@ -309,7 +309,7 @@ public class GeneratorServiceImpl implements GeneratorService {
// 例如：D:/continew-admin-ui/src/api/tool/xxx.ts
File apiParentFile = FileUtil.file(frontendModulePath, "src", "api", apiModuleName);
File apiFile = new File(apiParentFile, apiCodePreview.getFileName());
if (apiFile.exists() && !isOverride) {
if (apiFile.exists() && Boolean.FALSE.equals(isOverride)) {
return;
}
FileUtil.writeUtf8String(apiCodePreview.getContent(), apiFile);
@@ -318,7 +318,7 @@ public class GeneratorServiceImpl implements GeneratorService {
// 例如：D:/continew-admin-ui/src/views/tool/xxx/index.vue
File indexFile = FileUtil.file(frontendPath, apiModuleName, StrUtil
.lowerFirst(classNamePrefix), "index.vue");
if (indexFile.exists() && !isOverride) {
if (indexFile.exists() && Boolean.FALSE.equals(isOverride)) {
return;
}
FileUtil.writeUtf8String(viewCodePreview.getContent(), indexFile);