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: 移除所有的 @Accessors(chain = true)，并全局配置禁止使用

Browse Source
This commit is contained in:
Charles7c
2023-08-11 23:59:44 +08:00
parent 2d0e1f42d4
commit 76c65463c2
20 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ 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;
@@ -48,9 +47,8 @@ import top.charles7c.cnadmin.tool.enums.FormTypeEnum;
* @since 2023/4/12 20:21
*/
@Data
@TableName("gen_field_config")
@NoArgsConstructor
@Accessors(chain = true)
@TableName("gen_field_config")
@Schema(description = "字段配置信息")
public class FieldConfigDO implements Serializable {
@@ -144,22 +142,25 @@ public class FieldConfigDO implements Serializable {
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.setColumnName(column.getName());
this.setColumnType(columnType);
this.setComment(column.getComment());
this.setIsRequired(isRequired);
this.setShowInList(true);
this.setShowInForm(isRequired);
this.setShowInQuery(isRequired);
this.setFormType(FormTypeEnum.TEXT);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.INNER_LIKE : QueryTypeEnum.EQUAL);
}
public FieldConfigDO setColumnName(String columnName) {
public void setColumnName(String columnName) {
this.columnName = columnName;
this.fieldName = StrUtil.toCamelCase(this.columnName);
return this;
}
public FieldConfigDO setColumnType(String columnType) {
public void setColumnType(String columnType) {
this.columnType = columnType;
Props generatorProp = PropsUtil.get("generator");
this.fieldType = generatorProp.getStr(columnType);
return this;
}
}

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

@@ -25,7 +25,6 @@ import javax.validation.constraints.Pattern;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -42,9 +41,8 @@ import top.charles7c.cnadmin.common.constant.RegexConsts;
* @since 2023/4/12 20:21
*/
@Data
@TableName("gen_config")
@NoArgsConstructor
@Accessors(chain = true)
@TableName("gen_config")
@Schema(description = "生成配置信息")
public class GenConfigDO implements Serializable {

2
continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/model/vo/TableVO.java
View File

@@ -20,7 +20,6 @@ import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.experimental.Accessors;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -31,7 +30,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @since 2023/4/12 20:21
*/
@Data
@Accessors(chain = true)
@Schema(description = "表信息")
public class TableVO implements Serializable {

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

@@ -134,7 +134,8 @@ public class GeneratorServiceImpl implements GeneratorService {
if (null != fieldConfig) {
// 更新已有字段配置
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConsts.SPACE)[0].toLowerCase();
fieldConfig.setColumnType(columnType).setComment(column.getComment());
fieldConfig.setColumnType(columnType);
fieldConfig.setComment(column.getComment());
} else {
// 新增字段配置
fieldConfig = new FieldConfigDO(column);