|
|
@@ -54,7 +54,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
//表描述
|
|
|
String tableComment = genTable.getTableComment();
|
|
|
String tableName = genTable.getTableName();
|
|
|
- tableSql.setCreateSql(createSql(tableSql, tableComment));
|
|
|
+ tableSql.setCreateSql(createSql(tableSql, tableComment,tableName));
|
|
|
tableSql.setCreateBy(SecurityUtils.getUsername());
|
|
|
tableSql.setCreateLog(DateUtils.getTime() + " " + SecurityUtils.getUsername() + " 创建表 " + tableName);
|
|
|
tableSqlMapper.insertTableSql(tableSql);
|
|
|
@@ -72,7 +72,8 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
GenTable genTable = genTableMapper.selectGenTableById(tableSql.getTableId());
|
|
|
//表描述
|
|
|
String tableComment = genTable.getTableComment();
|
|
|
- tableSql.setCreateSql(createSql(tableSql, tableComment));
|
|
|
+ String tableName = genTable.getTableName();
|
|
|
+ tableSql.setCreateSql(createSql(tableSql, tableComment,tableName));
|
|
|
String createLog = tableSql.getCreateLog();
|
|
|
StringBuffer sb = new StringBuffer(createLog);
|
|
|
sb.append("\r\n").append(DateUtils.getTime()).append(" ").append(SecurityUtils.getUsername()).append("刷新创建语句");
|
|
|
@@ -143,7 +144,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
* @param tableComment
|
|
|
* @return
|
|
|
*/
|
|
|
- private String createSql(TableSql tableSql,String tableComment) {
|
|
|
+ private String createSql(TableSql tableSql,String tableComment,String tableName) {
|
|
|
//根据表id查询所有字段
|
|
|
List<GenTableColumn> genTableColumns = genTableColumnMapper.selectGenTableColumnListByTableId(tableSql.getTableId());
|
|
|
//定义主键id
|
|
|
@@ -151,7 +152,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
|
|
|
//拼接建表语句
|
|
|
StringBuffer sb = new StringBuffer("create table if not exists ");
|
|
|
String trimName = StringUtils.trim(tableComment);
|
|
|
- sb.append(trimName).append(" (\r\n");
|
|
|
+ sb.append(tableName).append(" (\r\n");
|
|
|
for (GenTableColumn genTableColumn : genTableColumns) {
|
|
|
if (!"HR".equals(genTableColumn.getHtmlType())){
|
|
|
sb.append("`").append(StringUtils.trim(genTableColumn.getColumnName())).append("` ").append(StringUtils.trim(genTableColumn.getColumnType()));
|
Administrator