Forráskód Böngészése

fix getObj代码丢失

Administrator 4 éve
szülő
commit
51858a400e

+ 3 - 3
boman-modules/boman-gen/src/main/java/com/boman/gen/controller/GenController.java

@@ -144,7 +144,7 @@ public class GenController extends BaseController {
     public AjaxResult editSave(@Validated @RequestBody GenTable genTable) {
         genTableService.validateEdit(genTable);
         genTableService.updateGenTable(genTable);
-        loadTableServer.loadTable(new GenTable());
+        //loadTableServer.loadTable(new GenTable());
         return AjaxResult.success();
     }
 
@@ -156,7 +156,7 @@ public class GenController extends BaseController {
     @DeleteMapping("/{tableIds}")
     public AjaxResult remove(@PathVariable Long[] tableIds) {
         genTableService.deleteGenTableByIds(tableIds);
-        loadTableServer.loadTable(new GenTable());
+        //loadTableServer.loadTable(new GenTable());
         return AjaxResult.success();
     }
 
@@ -237,7 +237,7 @@ public class GenController extends BaseController {
             return AjaxResult.error("新增表名'" + genTable.getTableName() + "'失败,表名已存在");
         }
         AjaxResult ajaxResult = genTableService.insertGenTable(genTable);
-        loadTableServer.loadTable(new GenTable());
+        //loadTableServer.loadTable(new GenTable());
         return ajaxResult;
     }
 }

+ 6 - 5
boman-modules/boman-gen/src/main/java/com/boman/gen/service/TableSqlServiceImpl.java

@@ -147,17 +147,18 @@ public class TableSqlServiceImpl implements ITableSqlService {
         String primaryKey = null;
         //拼接建表语句
         StringBuffer sb = new StringBuffer("create table if not exists ");
-        sb.append(tableName).append(" (\r\n");
+        String trimName = StringUtils.trim(tableName);
+        sb.append(trimName).append(" (\r\n");
         for (GenTableColumn genTableColumn : genTableColumns) {
             if (!"HR".equals(genTableColumn.getHtmlType())){
-                sb.append(genTableColumn.getColumnName()).append(" ").append(genTableColumn.getColumnType());
+                sb.append("`").append(StringUtils.trim(genTableColumn.getColumnName())).append("` ").append(StringUtils.trim(genTableColumn.getColumnType()));
                 if (genTableColumn.getIsPk().equals(UserConstants.INCREMENT)) {
                     primaryKey = genTableColumn.getColumnName();
                     sb.append(" NOT NULL COMMENT '");
                 }else {
-                    sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(genTableColumn.getDefaultValue()).append("' COMMENT '");
+                    sb = genTableColumn.getDefaultValue() == null ? sb.append(" DEFAULT NULL COMMENT '") : sb.append(" DEFAULT '").append(StringUtils.trim(genTableColumn.getDefaultValue())).append("' COMMENT '");
                 }
-                sb.append(genTableColumn.getColumnComment()).append("'").append(",").append("\r\n");
+                sb.append(StringUtils.trim(genTableColumn.getColumnComment())).append("'").append(",").append("\r\n");
             }
         }
         if (StringUtils.isNotBlank(primaryKey)) {
@@ -165,7 +166,7 @@ public class TableSqlServiceImpl implements ITableSqlService {
         }else {
             sb.replace(sb.lastIndexOf(","),sb.length(),"\r\n");
         }
-        sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='").append(tableName).append("';");
+        sb.append(") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='").append(trimName).append("';");
         return sb.toString();
     }