feat(tool/generator): 代码生成 Request 实体时,针对字符串类型增加数据长度校验注解
This commit is contained in:
parent
e3e958b419
commit
ee8255876f
@ -77,6 +77,12 @@ public class FieldConfigDO implements Serializable {
|
|||||||
@NotBlank(message = "列类型不能为空")
|
@NotBlank(message = "列类型不能为空")
|
||||||
private String columnType;
|
private String columnType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 列大小
|
||||||
|
*/
|
||||||
|
@Schema(description = "列大小", example = "255")
|
||||||
|
private Long columnSize;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字段名称
|
* 字段名称
|
||||||
*/
|
*/
|
||||||
@ -147,6 +153,7 @@ public class FieldConfigDO implements Serializable {
|
|||||||
this.tableName = column.getTableName();
|
this.tableName = column.getTableName();
|
||||||
this.setColumnName(column.getName());
|
this.setColumnName(column.getName());
|
||||||
this.setColumnType(columnType);
|
this.setColumnType(columnType);
|
||||||
|
this.setColumnSize(column.getSize());
|
||||||
this.setComment(column.getComment());
|
this.setComment(column.getComment());
|
||||||
this.setIsRequired(isRequired);
|
this.setIsRequired(isRequired);
|
||||||
this.setShowInList(true);
|
this.setShowInList(true);
|
||||||
|
@ -138,7 +138,6 @@ public class GeneratorServiceImpl implements GeneratorService {
|
|||||||
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
|
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
|
||||||
return columnList.stream().map(FieldConfigDO::new).collect(Collectors.toList());
|
return columnList.stream().map(FieldConfigDO::new).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
// 同步最新数据表列信息
|
// 同步最新数据表列信息
|
||||||
if (requireSync) {
|
if (requireSync) {
|
||||||
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
|
Collection<Column> columnList = MetaUtils.getColumns(dataSource, tableName);
|
||||||
@ -155,6 +154,7 @@ public class GeneratorServiceImpl implements GeneratorService {
|
|||||||
String columnType =
|
String columnType =
|
||||||
StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase();
|
StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase();
|
||||||
fieldConfig.setColumnType(columnType);
|
fieldConfig.setColumnType(columnType);
|
||||||
|
fieldConfig.setColumnSize(column.getSize());
|
||||||
fieldConfig.setComment(column.getComment());
|
fieldConfig.setComment(column.getComment());
|
||||||
} else {
|
} else {
|
||||||
// 新增字段配置
|
// 新增字段配置
|
||||||
@ -193,7 +193,6 @@ public class GeneratorServiceImpl implements GeneratorService {
|
|||||||
fieldConfig.setTableName(tableName);
|
fieldConfig.setTableName(tableName);
|
||||||
}
|
}
|
||||||
fieldConfigMapper.insertBatch(fieldConfigList);
|
fieldConfigMapper.insertBatch(fieldConfigList);
|
||||||
|
|
||||||
// 保存或更新生成配置信息
|
// 保存或更新生成配置信息
|
||||||
GenConfigDO newGenConfig = req.getGenConfig();
|
GenConfigDO newGenConfig = req.getGenConfig();
|
||||||
String frontendPath = newGenConfig.getFrontendPath();
|
String frontendPath = newGenConfig.getFrontendPath();
|
||||||
|
@ -16,6 +16,8 @@ import lombok.Data;
|
|||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
|
||||||
|
import org.hibernate.validator.constraints.Length;
|
||||||
|
|
||||||
import top.charles7c.continew.starter.extension.crud.base.BaseReq;
|
import top.charles7c.continew.starter.extension.crud.base.BaseReq;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -45,6 +47,9 @@ public class ${className} extends BaseReq {
|
|||||||
@NotNull(message = "${fieldConfig.comment}不能为空")
|
@NotNull(message = "${fieldConfig.comment}不能为空")
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
|
<#if fieldConfig.fieldType = 'String' && fieldConfig.columnSize??>
|
||||||
|
@Length(max = ${fieldConfig.columnSize}, message = "${fieldConfig.comment}长度不能超过 {max} 个字符")
|
||||||
|
</#if>
|
||||||
private ${fieldConfig.fieldType} ${fieldConfig.fieldName};
|
private ${fieldConfig.fieldType} ${fieldConfig.fieldName};
|
||||||
</#if>
|
</#if>
|
||||||
</#list>
|
</#list>
|
||||||
|
@ -140,7 +140,7 @@
|
|||||||
<template #icon><icon-edit /></template>修改
|
<template #icon><icon-edit /></template>修改
|
||||||
</a-button>
|
</a-button>
|
||||||
<a-popconfirm
|
<a-popconfirm
|
||||||
content="确定要删除当前选中的数据吗?"
|
content="是否确定删除该数据?"
|
||||||
type="warning"
|
type="warning"
|
||||||
@ok="handleDelete([record.id])"
|
@ok="handleDelete([record.id])"
|
||||||
>
|
>
|
||||||
@ -421,7 +421,7 @@
|
|||||||
proxy.$modal.warning({
|
proxy.$modal.warning({
|
||||||
title: '警告',
|
title: '警告',
|
||||||
titleAlign: 'start',
|
titleAlign: 'start',
|
||||||
content: '确定要删除当前选中的数据吗?',
|
content: `是否确定删除所选的${r'${ids.value.length}'}条数据?`,
|
||||||
hideCancel: false,
|
hideCancel: false,
|
||||||
onOk: () => {
|
onOk: () => {
|
||||||
handleDelete(ids.value);
|
handleDelete(ids.value);
|
||||||
|
@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS `gen_field_config` (
|
|||||||
`table_name` varchar(64) NOT NULL COMMENT '表名称',
|
`table_name` varchar(64) NOT NULL COMMENT '表名称',
|
||||||
`column_name` varchar(64) NOT NULL COMMENT '列名称',
|
`column_name` varchar(64) NOT NULL COMMENT '列名称',
|
||||||
`column_type` varchar(25) NOT NULL COMMENT '列类型',
|
`column_type` varchar(25) NOT NULL COMMENT '列类型',
|
||||||
|
`column_size` bigint(20) DEFAULT NULL COMMENT '列大小',
|
||||||
`field_name` varchar(64) NOT NULL COMMENT '字段名称',
|
`field_name` varchar(64) NOT NULL COMMENT '字段名称',
|
||||||
`field_type` varchar(25) NOT NULL COMMENT '字段类型',
|
`field_type` varchar(25) NOT NULL COMMENT '字段类型',
|
||||||
`comment` varchar(512) DEFAULT NULL COMMENT '注释',
|
`comment` varchar(512) DEFAULT NULL COMMENT '注释',
|
||||||
|
Loading…
Reference in New Issue
Block a user