Commit 4ce1fa53d8cd7a7f5a3542239804ecc7c94165d5

Authored by shanzhiliu
1 parent cb2570c0

1.代码格式调整

src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaColumnMapper.java
@@ -10,7 +10,7 @@ import java.util.List; @@ -10,7 +10,7 @@ import java.util.List;
10 @Mapper 10 @Mapper
11 public interface ToolSchemaColumnMapper extends BaseMapperX<ToolSchemaColumnDO> { 11 public interface ToolSchemaColumnMapper extends BaseMapperX<ToolSchemaColumnDO> {
12 12
13 - default List<ToolSchemaColumnDO> selectListByTableName(String tableSchema,String tableName) { 13 + default List<ToolSchemaColumnDO> selectListByTableName(String tableSchema, String tableName) {
14 return selectList(new QueryWrapper<ToolSchemaColumnDO>().eq("table_name", tableName) 14 return selectList(new QueryWrapper<ToolSchemaColumnDO>().eq("table_name", tableName)
15 .eq("table_schema", tableSchema) 15 .eq("table_schema", tableSchema)
16 .orderByAsc("ordinal_position")); 16 .orderByAsc("ordinal_position"));
src/main/java/cn/iocoder/dashboard/modules/tool/dal/mysql/codegen/ToolSchemaTableMapper.java
@@ -22,7 +22,7 @@ public interface ToolSchemaTableMapper extends BaseMapperX&lt;ToolSchemaTableDO&gt; { @@ -22,7 +22,7 @@ public interface ToolSchemaTableMapper extends BaseMapperX&lt;ToolSchemaTableDO&gt; {
22 return selectList(new QueryWrapper<ToolSchemaTableDO>().eq("table_schema", tableSchema)); 22 return selectList(new QueryWrapper<ToolSchemaTableDO>().eq("table_schema", tableSchema));
23 } 23 }
24 24
25 - default ToolSchemaTableDO selectByTableName1(String tableSchema,String tableName) { 25 + default ToolSchemaTableDO selectByTableName1(String tableSchema, String tableName) {
26 return selectOne(new QueryWrapper<ToolSchemaTableDO>().eq("table_schema",tableSchema) 26 return selectOne(new QueryWrapper<ToolSchemaTableDO>().eq("table_schema",tableSchema)
27 .eq("table_name", tableName)); 27 .eq("table_name", tableName));
28 } 28 }
src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenServiceImpl.java
@@ -104,8 +104,8 @@ public class ToolCodegenServiceImpl implements ToolCodegenService { @@ -104,8 +104,8 @@ public class ToolCodegenServiceImpl implements ToolCodegenService {
104 //获取当前schema 104 //获取当前schema
105 String tableSchema = codegenProperties.getDbSchemas().iterator().next(); 105 String tableSchema = codegenProperties.getDbSchemas().iterator().next();
106 // 从数据库中,获得数据库表结构 106 // 从数据库中,获得数据库表结构
107 - ToolSchemaTableDO schemaTable = schemaTableMapper.selectByTableName1(tableSchema,tableName);  
108 - List<ToolSchemaColumnDO> schemaColumns = schemaColumnMapper.selectListByTableName(tableSchema,tableName); 107 + ToolSchemaTableDO schemaTable = schemaTableMapper.selectByTableName1(tableSchema, tableName);
  108 + List<ToolSchemaColumnDO> schemaColumns = schemaColumnMapper.selectListByTableName(tableSchema, tableName);
109 // 导入 109 // 导入
110 return this.createCodegen0(ToolCodegenImportTypeEnum.DB, schemaTable, schemaColumns); 110 return this.createCodegen0(ToolCodegenImportTypeEnum.DB, schemaTable, schemaColumns);
111 } 111 }
@@ -145,7 +145,7 @@ public class ToolCodegenServiceImpl implements ToolCodegenService { @@ -145,7 +145,7 @@ public class ToolCodegenServiceImpl implements ToolCodegenService {
145 } 145 }
146 String tableSchema = codegenProperties.getDbSchemas().iterator().next(); 146 String tableSchema = codegenProperties.getDbSchemas().iterator().next();
147 // 从数据库中,获得数据库表结构 147 // 从数据库中,获得数据库表结构
148 - List<ToolSchemaColumnDO> schemaColumns = schemaColumnMapper.selectListByTableName(tableSchema,table.getTableName()); 148 + List<ToolSchemaColumnDO> schemaColumns = schemaColumnMapper.selectListByTableName(tableSchema, table.getTableName());
149 149
150 // 执行同步 150 // 执行同步
151 this.syncCodegen0(tableId, schemaColumns); 151 this.syncCodegen0(tableId, schemaColumns);