From 485a49693b1a98f83e968a75e20523cca638cc77 Mon Sep 17 00:00:00 2001 From: SliverHorn Date: Sat, 7 Nov 2020 11:38:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E5=88=AB=E5=8D=95?= =?UTF-8?q?=E8=AF=8Dcolume=20->=20column,=20=E5=88=A0=E9=99=A4tag=E4=B8=AD?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/api/v1/sys_auto_code.go | 8 ++++---- server/model/request/sys_autocode.go | 12 +++++------ server/router/sys_auto_code.go | 2 +- server/service/sys_auto_code.go | 6 +++--- web/src/api/autoCode.js | 4 ++-- web/src/view/systemTools/autoCode/index.vue | 22 ++++++++++----------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/server/api/v1/sys_auto_code.go b/server/api/v1/sys_auto_code.go index 1b75348a..4c9aafad 100644 --- a/server/api/v1/sys_auto_code.go +++ b/server/api/v1/sys_auto_code.go @@ -139,16 +139,16 @@ func GetDB(c *gin.Context) { // @accept application/json // @Produce application/json // @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}" -// @Router /autoCode/getDatabase [get] -func GetColume(c *gin.Context) { +// @Router /autoCode/getColumn [get] +func GetColumn(c *gin.Context) { dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname) tableName := c.Query("tableName") - err, columes := service.GetColume(tableName, dbName) + err, columns := service.GetColumn(tableName, dbName) if err != nil { response.FailWithMessage(fmt.Sprintf("查询table失败，%v", err), c) } else { response.OkWithData(gin.H{ - "columes": columes, + "columns": columns, }, c) } } diff --git a/server/model/request/sys_autocode.go b/server/model/request/sys_autocode.go index e5cbcc90..d97be350 100644 --- a/server/model/request/sys_autocode.go +++ b/server/model/request/sys_autocode.go @@ -1,16 +1,16 @@ package request type DBReq struct { - Database string `json:"database";gorm:"column:database"` + Database string `json:"database" gorm:"column:database"` } type TableReq struct { TableName string `json:"tableName"` } -type ColumeReq struct { - ColumeName string `json:"columeName";gorm:"column:colume_name"` - DataType string `json:"dataType";gorm:"column:data_type"` - DataTypeLong string `json:"dataTypeLong";gorm:"column:data_type_long"` - ColumeComment string `json:"columeComment";gorm:"column:colume_comment"` +type ColumnReq struct { + ColumnName string `json:"columnName" gorm:"column:column_name"` + DataType string `json:"dataType" gorm:"column:data_type"` + DataTypeLong string `json:"dataTypeLong" gorm:"column:data_type_long"` + ColumnComment string `json:"columnComment" gorm:"column:column_comment"` } diff --git a/server/router/sys_auto_code.go b/server/router/sys_auto_code.go index a10ee877..2cbdd99e 100644 --- a/server/router/sys_auto_code.go +++ b/server/router/sys_auto_code.go @@ -15,6 +15,6 @@ func InitAutoCodeRouter(Router *gin.RouterGroup) { AutoCodeRouter.POST("createTemp", v1.CreateTemp) // 创建自动化代码 AutoCodeRouter.GET("getTables", v1.GetTables) // 获取对应数据库的表 AutoCodeRouter.GET("getDB", v1.GetDB) // 获取数据库 - AutoCodeRouter.GET("getColume", v1.GetColume) // 获取指定表所有字段信息 + AutoCodeRouter.GET("getColumn", v1.GetColumn) // 获取指定表所有字段信息 } } diff --git a/server/service/sys_auto_code.go b/server/service/sys_auto_code.go index 41668ba7..888b7995 100644 --- a/server/service/sys_auto_code.go +++ b/server/service/sys_auto_code.go @@ -128,7 +128,7 @@ func GetDB() (err error, DBNames []request.DBReq) { return err, DBNames } -func GetColume(tableName string, dbName string) (err error, Columes []request.ColumeReq) { - err = global.GVA_DB.Raw("SELECT COLUMN_NAME colume_name,DATA_TYPE data_type,CASE DATA_TYPE WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH WHEN 'double' THEN CONCAT_WS( ',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE ) WHEN 'decimal' THEN CONCAT_WS( ',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE ) WHEN 'int' THEN c.NUMERIC_PRECISION WHEN 'bigint' THEN c.NUMERIC_PRECISION ELSE '' END AS data_type_long,COLUMN_COMMENT colume_comment FROM INFORMATION_SCHEMA.COLUMNS c WHERE table_name = ? AND table_schema = ?", tableName, dbName).Scan(&Columes).Error - return err, Columes +func GetColumn(tableName string, dbName string) (err error, Columns []request.ColumnReq) { + err = global.GVA_DB.Raw("SELECT COLUMN_NAME column_name,DATA_TYPE data_type,CASE DATA_TYPE WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH WHEN 'double' THEN CONCAT_WS( ',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE ) WHEN 'decimal' THEN CONCAT_WS( ',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE ) WHEN 'int' THEN c.NUMERIC_PRECISION WHEN 'bigint' THEN c.NUMERIC_PRECISION ELSE '' END AS data_type_long,COLUMN_COMMENT colume_comment FROM INFORMATION_SCHEMA.COLUMNS c WHERE table_name = ? AND table_schema = ?", tableName, dbName).Scan(&Columns).Error + return err, Columns } diff --git a/web/src/api/autoCode.js b/web/src/api/autoCode.js index d727adfb..bee86190 100644 --- a/web/src/api/autoCode.js +++ b/web/src/api/autoCode.js @@ -59,9 +59,9 @@ export const getTable = (params) => { // @Produce application/json // @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}" // @Router /autoCode/getColume [get] -export const getColume = (params) => { +export const getColumn = (params) => { return service({ - url: "/autoCode/getColume", + url: "/autoCode/getColumn", method: 'get', params, }) diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index 3573e721..e5797b4c 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -36,7 +36,7 @@ - 使用此表创建 + 使用此表创建 @@ -145,7 +145,7 @@ const fieldTemplate = { import FieldDialog from "@/view/systemTools/autoCode/component/fieldDialog.vue"; import { toUpperCase, toHump } from "@/utils/stringFun.js"; -import { createTemp, getDB, getTable, getColume } from "@/api/autoCode.js"; +import { createTemp, getDB, getTable, getColumn } from "@/api/autoCode.js"; import { getDict } from "@/utils/dictionary"; export default { @@ -316,9 +316,9 @@ export default { } this.dbform.tableName = ""; }, - async getColume() { + async getColumn() { const gormModelList = ["id", "created_at", "updated_at", "deleted_at"]; - const res = await getColume(this.dbform); + const res = await getColumn(this.dbform); if (res.code == 0) { const tbHump = toHump(this.dbform.tableName); this.form.structName = toUpperCase(tbHump); @@ -328,19 +328,19 @@ export default { this.form.description = tbHump + "表"; this.form.autoCreateApiToSql = true; this.form.fields = []; - res.data.columes && - res.data.columes.map(item => { - if (!gormModelList.some(gormfd => gormfd == item.columeName)) { - const fbHump = toHump(item.columeName); + res.data.columns && + res.data.columns.map(item => { + if (!gormModelList.some(gormfd => gormfd == item.columnName)) { + const fbHump = toHump(item.columnName); this.form.fields.push({ fieldName: toUpperCase(fbHump), - fieldDesc: item.columeComment || fbHump + "字段", + fieldDesc: item.columnComment || fbHump + "字段", fieldType: this.fdMap[item.dataType], dataType: item.dataType, fieldJson: fbHump, dataTypeLong: item.dataTypeLong, - columnName: item.columeName, - comment: item.columeComment, + columnName: item.columnName, + comment: item.columnComment, fieldSearchType: "", dictType:"" }); -- GitLab