liuxm/screw
1
0
Fork 0
forked from lxm_tools/screw
Code Issues Pull Requests Projects Releases Wiki Activity

♻️ 重构代码

Browse Source
This commit is contained in:
SanLi
2020-08-26 15:31:20 +08:00
parent 110c0b838e
commit 6906f83ecf
12 changed files with 88 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
screw-core/src/main/java/cn/smallbun/screw/core/metadata/model/ColumnModel.java
View File

@@ -58,9 +58,17 @@ public class ColumnModel implements Serializable {
*/
private String columnName;
/**
* SQL 数据类型 名称
* SQL 数据类型带长度
*/
private String columnType;
/**
* SQL 数据类型 名称
*/
private String typeName;
/**
* 列长度
*/
private String columnLength;
/**
* 小数位
*/

4
screw-core/src/main/java/cn/smallbun/screw/core/process/DataModelProcess.java
View File

@@ -151,6 +151,10 @@ public class DataModelProcess extends AbstractProcess {
columnModel.setColumnName(column.getColumnName());
//类型
columnModel.setColumnType(column.getColumnType());
//字段名称
columnModel.setTypeName(column.getTypeName());
//长度
columnModel.setColumnLength(column.getColumnLength());
//小数位
columnModel.setDecimalDigits(
StringUtils.defaultString(column.getDecimalDigits(), ZERO_DECIMAL_DIGITS));

11
screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java
View File

@@ -114,9 +114,9 @@ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery {
//查询全部
if (table.equals(PERCENT_SIGN)) {
//获取全部表列信息SQL
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, replace(substring(a.COLUMN_TYPE, LOCATE('(', a.COLUMN_TYPE) + 1), ')', '') COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' ORDER BY A.COLUMN_NAME";
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, case when LOCATE('(', A.COLUMN_TYPE) > 0 then replace(substring(A.COLUMN_TYPE, LOCATE('(', A.COLUMN_TYPE) + 1), ')', '') else null end COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s'";
PreparedStatement statement = prepareStatement(
String.format(sql, getDataBase()));
String.format(sql, getDataBase().getDatabase()));
resultSet = statement.executeQuery();
int fetchSize = 4284;
if (resultSet.getFetchSize() < fetchSize) {
@@ -126,9 +126,9 @@ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery {
//单表查询
else {
//获取表列信息SQL 查询表名、列名、说明、数据类型
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, replace(substring(a.COLUMN_TYPE, LOCATE('(', a.COLUMN_TYPE) + 1), ')', '') COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' and A.TABLE_NAME = '%s' ORDER BY A.COLUMN_NAME";
resultSet = prepareStatement(String.format(sql, getDataBase(), table))
.executeQuery();
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, case when LOCATE('(', A.COLUMN_TYPE) > 0 then replace(substring(A.COLUMN_TYPE, LOCATE('(', A.COLUMN_TYPE) + 1), ')', '') else null end COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' and A.TABLE_NAME = '%s'";
resultSet = prepareStatement(
String.format(sql, getDataBase().getDatabase(), table)).executeQuery();
}
List<MariadbColumnModel> inquires = Mapping.convertList(resultSet,
MariadbColumnModel.class);
@@ -146,7 +146,6 @@ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery {
&& i.getTableName().equals(j.getTableName())) {
//放入列类型
i.setColumnType(j.getColumnType());
i.setRemarks(j.getRemarks());
i.setColumnLength(j.getColumnLength());
}
});

11
screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java
View File

@@ -119,9 +119,9 @@ public class MySqlDataBaseQuery extends AbstractDatabaseQuery {
//查询全部
if (table.equals(PERCENT_SIGN)) {
//获取全部表列信息SQL
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, replace(substring(a.COLUMN_TYPE, LOCATE('(', a.COLUMN_TYPE) + 1), ')', '') COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' ORDER BY A.COLUMN_NAME";
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, case when LOCATE('(', A.COLUMN_TYPE) > 0 then replace(substring(A.COLUMN_TYPE, LOCATE('(', A.COLUMN_TYPE) + 1), ')', '') else null end COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s'";
PreparedStatement statement = prepareStatement(
String.format(sql, getDataBase()));
String.format(sql, getDataBase().getDatabase()));
resultSet = statement.executeQuery();
int fetchSize = 4284;
if (resultSet.getFetchSize() < fetchSize) {
@@ -131,9 +131,9 @@ public class MySqlDataBaseQuery extends AbstractDatabaseQuery {
//单表查询
else {
//获取表列信息SQL 查询表名、列名、说明、数据类型
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, replace(substring(a.COLUMN_TYPE, LOCATE('(', a.COLUMN_TYPE) + 1), ')', '') COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' and A.TABLE_NAME = '%s' ORDER BY A.COLUMN_NAME";
resultSet = prepareStatement(String.format(sql, getDataBase(), table))
.executeQuery();
String sql = "SELECT A.TABLE_NAME, A.COLUMN_NAME, A.COLUMN_TYPE, case when LOCATE('(', A.COLUMN_TYPE) > 0 then replace(substring(A.COLUMN_TYPE, LOCATE('(', A.COLUMN_TYPE) + 1), ')', '') else null end COLUMN_LENGTH FROM INFORMATION_SCHEMA.COLUMNS A WHERE A.TABLE_SCHEMA = '%s' and A.TABLE_NAME = '%s'";
resultSet = prepareStatement(
String.format(sql, getDataBase().getDatabase(), table)).executeQuery();
}
List<MySqlColumnModel> inquires = Mapping.convertList(resultSet,
MySqlColumnModel.class);
@@ -151,7 +151,6 @@ public class MySqlDataBaseQuery extends AbstractDatabaseQuery {
&& i.getTableName().equals(j.getTableName())) {
//放入列类型
i.setColumnType(j.getColumnType());
i.setRemarks(j.getRemarks());
i.setColumnLength(j.getColumnLength());
}
});

53
screw-core/src/main/java/cn/smallbun/screw/core/query/postgresql/PostgreSqlDataBaseQuery.java
View File

@@ -27,14 +27,18 @@ import cn.smallbun.screw.core.query.postgresql.model.PostgreSqlColumnModel;
import cn.smallbun.screw.core.query.postgresql.model.PostgreSqlDatabaseModel;
import cn.smallbun.screw.core.query.postgresql.model.PostgreSqlPrimaryKeyModel;
import cn.smallbun.screw.core.query.postgresql.model.PostgreSqlTableModel;
import cn.smallbun.screw.core.query.sqlservice.model.SqlServerColumnModel;
import cn.smallbun.screw.core.util.Assert;
import cn.smallbun.screw.core.util.CollectionUtils;
import cn.smallbun.screw.core.util.ExceptionUtils;
import cn.smallbun.screw.core.util.JdbcUtils;
import javax.sql.DataSource;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
import java.util.stream.Collectors;
import static cn.smallbun.screw.core.constant.DefaultConstants.PERCENT_SIGN;
@@ -104,7 +108,54 @@ public class PostgreSqlDataBaseQuery extends AbstractDatabaseQuery {
//查询
resultSet = getMetaData().getColumns(getCatalog(), getSchema(), table, PERCENT_SIGN);
//映射
return Mapping.convertList(resultSet, PostgreSqlColumnModel.class);
List<PostgreSqlColumnModel> list = Mapping.convertList(resultSet,
PostgreSqlColumnModel.class);
//这里处理是为了如果是查询全部列呢？所以处理并获取唯一表名
List<String> tableNames = list.stream().map(PostgreSqlColumnModel::getTableName)
.collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
if (CollectionUtils.isEmpty(columnsCaching)) {
//查询全部
if (table.equals(PERCENT_SIGN)) {
//获取全部表列信息SQL
String sql = "select TABLE_NAME, TABLE_SCHEM, COLUMN_NAME, Length as COLUMN_LENGTH, concat(udt_name, case when Length isnull then '' else concat('(', concat(Length, ')')) end) as COLUMN_TYPE from(select table_schema as TABLE_SCHEM, column_name as COLUMN_NAME, table_name as TABLE_NAME, udt_name as udt_name, case when coalesce(character_maximum_length, numeric_precision, -1) = -1 then null else coalesce(character_maximum_length, numeric_precision, -1) end as Length from information_schema.columns a where table_schema = '%s' and table_catalog = '%s') t";
PreparedStatement statement = prepareStatement(
String.format(sql, getSchema(), getDataBase().getDatabase()));
resultSet = statement.executeQuery();
int fetchSize = 4284;
if (resultSet.getFetchSize() < fetchSize) {
resultSet.setFetchSize(fetchSize);
}
}
//单表查询
else {
//获取表列信息SQL 查询表名、列名、说明、数据类型
String sql = "select TABLE_NAME, TABLE_SCHEM, COLUMN_NAME, Length as COLUMN_LENGTH, concat(udt_name, case when Length isnull then '' else concat('(', concat(Length, ')')) end) as COLUMN_TYPE from(select table_schema as TABLE_SCHEM, column_name as COLUMN_NAME, table_name as TABLE_NAME, udt_name as udt_name, case when coalesce(character_maximum_length, numeric_precision, -1) = -1 then null else coalesce(character_maximum_length, numeric_precision, -1) end as Length from information_schema.columns a where a.table_name = '%s' and table_schema = '%s' and table_catalog = '%s') t";
resultSet = prepareStatement(
String.format(sql, table, getSchema(), getDataBase().getDatabase()))
.executeQuery();
}
List<SqlServerColumnModel> inquires = Mapping.convertList(resultSet,
SqlServerColumnModel.class);
//处理列，表名为key，列名为值
tableNames.forEach(name -> columnsCaching.put(name, inquires.stream()
.filter(i -> i.getTableName().equals(name)).collect(Collectors.toList())));
}
//处理备注信息
list.forEach(i -> {
//从缓存中根据表名获取列信息
List<Column> columns = columnsCaching.get(i.getTableName());
columns.forEach(j -> {
//列名表名一致
if (i.getColumnName().equals(j.getColumnName())
&& i.getTableName().equals(j.getTableName())) {
//放入备注
i.setRemarks(j.getRemarks());
i.setColumnLength(j.getColumnLength());
i.setColumnType(j.getColumnType());
}
});
});
return list;
} catch (SQLException e) {
throw ExceptionUtils.mpe(e);
} finally {

2
screw-core/src/main/resources/template/freemarker/documentation_html.ftl
View File

@@ -17,4 +17,4 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html lang="zh"><head><title>${title!'数据库设计文档'}</title><style type='text/css'>body { padding-bottom: 50px } body, td { font-family: verdana, fantasy; font-size: 12px; line-height: 150% } table { width: 100%; background-color: #ccc; margin: 5px 0 } td { background-color: #fff; padding: 3px 3px 3px 10px } thead td { text-align: center; font-weight: bold; background-color: #eee } a:link, a:visited, a:active { color: #015fb6; text-decoration: none } a:hover { color: #e33e06 }</style></head><body style='text-align:center;'><div style='width:800px; margin:20px auto; text-align:left;'><a name='index'></a><h2 style='text-align:center; line-height:50px;'>${title!'数据库设计文档'}</h2><div><b>数据库名：${database!''}</b><br><#if (version)??><b>文档版本：${version!''}</b><br></#if><#if (description)??><b>文档描述：${description!''}</b><br></#if></div><table cellspacing='1'><thead><tr><td style='width:40px; '>序号</td><td>表名</td><td>说明</td></tr></thead><#list tables><#items as t><tr><td style='text-align:center;'>${t?index+1}</td><td><a href='#${t.tableName}'>${t.tableName}</a></td><td>${t.remarks!''}</td></tr></#items></#list></table><#list tables><#items as t><a name='${t.tableName}'></a><div style='margin-top:30px;'><a href='#index' style='float:right; margin-top:6px;'>返回目录</a><b>表名：${t.tableName}</b></div><div>说明：${t.remarks!''}</div><div>数据列：</div><table cellspacing='1'><thead><tr><td style='width:40px; '>序号</td><td>名称</td><td>数据类型</td><td>长度</td><td>小数位</td><td>允许空值</td><td>主键</td><td>默认值</td><td>说明</td></tr></thead><#list t.columns><#items as c><tr><td style='text-align:center;'>${c?index+1}</td><td>${c.columnName!''}</td><td align='center'>${c.typeName!''}</td><td align='center'>${c.columnLength!''}</td><td align='center'>${c.decimalDigits!'0'}</td><td align='center'>${c.nullable!''}</td><td align='center'>${c.primaryKey!''}</td><td align='center'>${c.columnDef!''}</td><td align='center'>${c.remarks!''}</td></tr></#items></#list></table></#items></#list></div><footer><#--机构信息--><#if (organization)??><div><a href="${organizationUrl!'#'}">${organization!''}</a></div></#if></footer></body></html>
<html lang="zh"><head><title>${title!'数据库设计文档'}</title><style type='text/css'>body { padding-bottom: 50px } body, td { font-family: verdana, fantasy; font-size: 12px; line-height: 150% } table { width: 100%; background-color: #ccc; margin: 5px 0 } td { background-color: #fff; padding: 3px 3px 3px 10px } thead td { text-align: center; font-weight: bold; background-color: #eee } a:link, a:visited, a:active { color: #015fb6; text-decoration: none } a:hover { color: #e33e06 }</style></head><body style='text-align:center;'><div style='width:800px; margin:20px auto; text-align:left;'><a name='index'></a><h2 style='text-align:center; line-height:50px;'>${title!'数据库设计文档'}</h2><div><b>数据库名：${database!''}</b><br><#if (version)??><b>文档版本：${version!''}</b><br></#if><#if (description)??><b>文档描述：${description!''}</b><br></#if></div><table cellspacing='1'><thead><tr><td style='width:40px; '>序号</td><td>表名</td><td>说明</td></tr></thead><#list tables><#items as t><tr><td style='text-align:center;'>${t?index+1}</td><td><a href='#${t.tableName}'>${t.tableName}</a></td><td>${t.remarks!''}</td></tr></#items></#list></table><#list tables><#items as t><a name='${t.tableName}'></a><div style='margin-top:30px;'><a href='#index' style='float:right; margin-top:6px;'>返回目录</a><b>表名：${t.tableName}</b></div><div>说明：${t.remarks!''}</div><div>数据列：</div><table cellspacing='1'><thead><tr><td style='width:40px; '>序号</td><td>名称</td><td>数据类型</td><td>长度</td><td>小数位</td><td>允许空值</td><td>主键</td><td>默认值</td><td>说明</td></tr></thead><#list t.columns><#items as c><tr><td style='text-align:center;'>${c?index+1}</td><td>${c.columnName!''}</td><td align='center'>${c.columnType!''}</td><td align='center'>${c.columnLength!''}</td><td align='center'>${c.decimalDigits!'0'}</td><td align='center'>${c.nullable!''}</td><td align='center'>${c.primaryKey!''}</td><td align='center'>${c.columnDef!''}</td><td align='center'>${c.remarks!''}</td></tr></#items></#list></table></#items></#list></div><footer><#--机构信息--><#if (organization)??><div><a href="${organizationUrl!'#'}">${organization!''}</a></div></#if></footer></body></html>

2
screw-core/src/main/resources/template/freemarker/documentation_md.ftl
View File

@@ -50,7 +50,7 @@
| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
<#items as c>
| ${c?index+1} | ${c.columnName!''} | ${c.typeName!''} | ${c.columnLength!''} | ${c.decimalDigits!'0'} | ${c.nullable!''} | ${c.primaryKey!''} | ${c.columnDef!''} | ${c.remarks!''} |
| ${c?index+1} | ${c.columnName!''} | ${c.columnType!''} | ${c.columnLength!''} | ${c.decimalDigits!'0'} | ${c.nullable!''} | ${c.primaryKey!''} | ${c.columnDef!''} | ${c.remarks!''} |
</#items>
</#list></#items>
</#list>

2
screw-core/src/main/resources/template/freemarker/documentation_word.ftl
View File

File diff suppressed because one or more lines are too long

2
screw-core/src/main/resources/template/velocity/documentation_html.vm
View File

@@ -15,4 +15,4 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*#
<html><head><title>#if(${_data.title})${_data.title}#else 数据库设计文档#end</title><style type="text/css">body { padding-bottom: 50px } body, td { font-family: verdana, fantasy; font-size: 12px; line-height: 150% } table { width: 100%; background-color: #ccc; margin: 5px 0 } td { background-color: #fff; padding: 3px 3px 3px 10px } thead td { text-align: center; font-weight: 700; background-color: #eee } a:active, a:link, a:visited { color: #015fb6; text-decoration: none } a:hover { color: #e33e06 }</style></head><body style="text-align:center"><div style="width:800px;margin:20px auto;text-align:left"><a name="index"></a><h2 style="text-align:center;line-height:50px">#if(${_data.title})${_data.title}#else 数据库设计文档#end</h2><div><b>数据库名：$!{_data.database}</b><br> #*文档版本*# #if(${_data.version})<b>文档版本：$!{_data.version}</b><br> #end #*文档描述*# #if(${_data.description})<b>文档描述：$!{_data.description}</b><br> #end</div><table cellspacing="1"><thead><tr><td style="width:40px">序号</td><td>表名</td><td>说明</td></tr></thead>#foreach($t in $_data.tables)<tr><td style="text-align:center">$!{velocityCount}</td><td><a href="#$!{t.tableName}">$!{t.tableName}</a></td><td>$!{t.remarks}</td></tr>#end</table>#foreach($t in $_data.tables)<a name="$!{t.tableName}"></a><div style="margin-top:30px"><a href="#index" style="float:right;margin-top:6px">返回目录</a><b>表名：$!{t.tableName}</b></div><div>说明：$!{t.remarks}</div><div>数据列：</div><table cellspacing="1"><thead><tr><td style="width:40px">序号</td><td>名称</td><td>数据类型</td><td>长度</td><td>小数位</td><td>允许空值</td><td>主键</td><td>默认值</td><td>说明</td></tr></thead>#foreach($c in $t.columns)<tr><td style="text-align:center">$!{velocityCount}</td><td>$!{c.columnName}</td><td align="center">$!{c.typeName}</td><td align="center">$!{c.columnLength}</td><td align="center">#if(${c.decimalDigits})${c.decimalDigits}#else 0#end</td><td align="center">$!{c.nullable}</td><td align="center">$!{c.primaryKey}</td><td align="center">$!{c.columnDef}</td><td align="center">$!{c.remarks}</td></tr>#end</table>#end</div><footer> #*机构信息*# #if(${_data.organization})<div><a href="#if(${_data.organizationUrl})$!{_data.organizationUrl}#else ''#end">$!{_data.organization}</a></div> #end</footer></body></html>
<html><head><title>#if(${_data.title})${_data.title}#else 数据库设计文档#end</title><style type="text/css">body { padding-bottom: 50px } body, td { font-family: verdana, fantasy; font-size: 12px; line-height: 150% } table { width: 100%; background-color: #ccc; margin: 5px 0 } td { background-color: #fff; padding: 3px 3px 3px 10px } thead td { text-align: center; font-weight: 700; background-color: #eee } a:active, a:link, a:visited { color: #015fb6; text-decoration: none } a:hover { color: #e33e06 }</style></head><body style="text-align:center"><div style="width:800px;margin:20px auto;text-align:left"><a name="index"></a><h2 style="text-align:center;line-height:50px">#if(${_data.title})${_data.title}#else 数据库设计文档#end</h2><div><b>数据库名：$!{_data.database}</b><br> #*文档版本*# #if(${_data.version})<b>文档版本：$!{_data.version}</b><br> #end #*文档描述*# #if(${_data.description})<b>文档描述：$!{_data.description}</b><br> #end</div><table cellspacing="1"><thead><tr><td style="width:40px">序号</td><td>表名</td><td>说明</td></tr></thead>#foreach($t in $_data.tables)<tr><td style="text-align:center">$!{velocityCount}</td><td><a href="#$!{t.tableName}">$!{t.tableName}</a></td><td>$!{t.remarks}</td></tr>#end</table>#foreach($t in $_data.tables)<a name="$!{t.tableName}"></a><div style="margin-top:30px"><a href="#index" style="float:right;margin-top:6px">返回目录</a><b>表名：$!{t.tableName}</b></div><div>说明：$!{t.remarks}</div><div>数据列：</div><table cellspacing="1"><thead><tr><td style="width:40px">序号</td><td>名称</td><td>数据类型</td><td>长度</td><td>小数位</td><td>允许空值</td><td>主键</td><td>默认值</td><td>说明</td></tr></thead>#foreach($c in $t.columns)<tr><td style="text-align:center">$!{velocityCount}</td><td>$!{c.columnName}</td><td align="center">$!{c.columnType}</td><td align="center">$!{c.columnLength}</td><td align="center">#if(${c.decimalDigits})${c.decimalDigits}#else 0#end</td><td align="center">$!{c.nullable}</td><td align="center">$!{c.primaryKey}</td><td align="center">$!{c.columnDef}</td><td align="center">$!{c.remarks}</td></tr>#end</table>#end</div><footer> #*机构信息*# #if(${_data.organization})<div><a href="#if(${_data.organizationUrl})$!{_data.organizationUrl}#else ''#end">$!{_data.organization}</a></div> #end</footer></body></html>

2
screw-core/src/main/resources/template/velocity/documentation_md.vm
View File

@@ -45,6 +45,6 @@
| 序号 | 名称 | 数据类型 | 长度 | 小数位 | 允许空值 | 主键 | 默认值 | 说明 |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
#foreach($c in $t.columns)
| $!{velocityCount} | $!{c.columnName} | $!{c.typeName} | $!{c.columnLength} | #if($!{c.decimalDigits})$!{c.decimalDigits}#else 0#end | $!{c.nullable}| $!{c.primaryKey} | $!{c.columnDef} | $!{c.remarks} |
| $!{velocityCount} | $!{c.columnName} | $!{c.columnType} | $!{c.columnLength} | #if($!{c.decimalDigits})$!{c.decimalDigits}#else 0#end | $!{c.nullable}| $!{c.primaryKey} | $!{c.columnDef} | $!{c.remarks} |
#end
#end

2
screw-core/src/main/resources/template/velocity/documentation_word.vm
View File

File diff suppressed because one or more lines are too long

14
screw-extension/src/main/java/cn/smallbun/screw/extension/pojo/process/PojoModelProcess.java
View File

@@ -84,27 +84,27 @@ public class PojoModelProcess implements PojoProcess {
Set<String> importList = new HashSet<>();
List<TypeModel> fieldList = new ArrayList<>();
for (ColumnModel column : model.getColumns()) {
/*for (ColumnModel column : model.getColumns()) {
TypeModel typeModel = new TypeModel();
typeModel.setFieldName(column.getColumnName());
typeModel.setFieldType(column.getTypeName());
typeModel.setRemarks(column.getRemarks());
//先判断用户是否自定义
Class<?> classType = dialect.getTypeByMap(customType, column.getTypeName());
if (classType == null) {
classType = dialect.getClassTypeByFieldType(column.getTypeName());
}
//如果对象不在java.lang包下，需要import
if (!classType.getTypeName().startsWith("java.lang")) {
importList.add(classType.getTypeName());
}
typeModel
.setClassName(nameStrategy.transFieldName(column.getColumnName(), classType));
typeModel.setClassType(classType.getSimpleName());
//如果不使用lombok，需要生成get，set方法
if (!pojoConfiguration.isUseLombok()) {
typeModel
@@ -112,9 +112,9 @@ public class PojoModelProcess implements PojoProcess {
typeModel
.setSetName(nameStrategy.transSetName(column.getColumnName(), classType));
}
fieldList.add(typeModel);
}
}*/
pojoModel.setImportList(importList);
pojoModel.setFieldList(fieldList);
pojoModels.add(pojoModel);