BJ_ZTEITS-Developers / parking-cloud-yudao

Commit e9b93ffe80e9b88e97ec0122a400c9315446c48a

Authored by 芋道源码
Committed by Gitee
2 parents d405f4df b66d8453

!57 代码生成工具问题修复 

Merge pull request !57 from chaocloud/master
Inline Side-by-side
Showing 2 changed files with 9 additions and 2 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenEngine.java
  View file @e9b93ff
@@ -191,7 +191,7 @@ public class ToolCodegenEngine { @@ -191,7 +191,7 @@ public class ToolCodegenEngine {
191 } 191 }
192 192
193 private static String javaFilePath(String path) { 193 private static String javaFilePath(String path) {
194 - return "java/${basePackage}/${table.moduleName}/" + path + ".java"; 194 + return "java/${basePackage}/modules/${table.moduleName}/" + path + ".java";
195 } 195 }
196 196
197 private static String vueTemplatePath(String path) { 197 private static String vueTemplatePath(String path) {
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/service/codegen/impl/ToolCodegenSQLParser.java
  View file @e9b93ff
@@ -64,10 +64,17 @@ public class ToolCodegenSQLParser { @@ -64,10 +64,17 @@ public class ToolCodegenSQLParser {
64 private static ToolSchemaTableDO parseTable(SQLCreateTableStatement statement) { 64 private static ToolSchemaTableDO parseTable(SQLCreateTableStatement statement) {
65 return ToolSchemaTableDO.builder() 65 return ToolSchemaTableDO.builder()
66 .tableName(statement.getTableSource().getTableName(true)) 66 .tableName(statement.getTableSource().getTableName(true))
67 - .tableComment(((SQLCharExpr) statement.getComment()).getText()) 67 + .tableComment(getCommentText(statement))
68 .build(); 68 .build();
69 } 69 }
70 70
  71 + private static String getCommentText(SQLCreateTableStatement statement) {
  72 + if (statement == null || statement.getComment() == null) {
  73 + return "";
  74 + }
  75 + return ((SQLCharExpr) statement.getComment()).getText();
  76 + }
  77 +
71 private static List<ToolSchemaColumnDO> parseColumns(SQLCreateTableStatement statement) { 78 private static List<ToolSchemaColumnDO> parseColumns(SQLCreateTableStatement statement) {
72 List<ToolSchemaColumnDO> columns = new ArrayList<>(); 79 List<ToolSchemaColumnDO> columns = new ArrayList<>();
73 statement.getTableElementList().forEach(element -> parseColumn(columns, element)); 80 statement.getTableElementList().forEach(element -> parseColumn(columns, element));