update
This commit is contained in:
1 parent
f25da5f1ee
commit
1df55e75e5
72 files changed
+1401
-1559
No files matched your search
@@ -21,7 +21,7 @@ type DBColumns struct {
|
||||
ColumnComment string `gorm:"column:COLUMN_COMMENT" json:"columnComment"`
|
||||
}
|
||||
|
||||
func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int32, error) {
|
||||
func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) {
|
||||
var doc []DBColumns
|
||||
|
||||
table := orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`")
|
||||
@@ -33,7 +33,7 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int32, er
|
||||
|
||||
table = table.Where("TABLE_NAME = ?", e.TableName)
|
||||
|
||||
var count int32
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
return nil, 0, err
|
||||
|
||||
@@ -16,7 +16,7 @@ type DBTables struct {
|
||||
TableComment string `gorm:"column:TABLE_COMMENT" json:"tableComment"`
|
||||
}
|
||||
|
||||
func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int32, error) {
|
||||
func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) {
|
||||
var doc []DBTables
|
||||
|
||||
table := orm.Eloquent.Select("*").Table("information_schema.tables")
|
||||
@@ -26,7 +26,7 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int32, erro
|
||||
table = table.Where("TABLE_NAME = ?", e.TableName)
|
||||
}
|
||||
|
||||
var count int32
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
return nil, 0, err
|
||||
|
||||
+38
-36
@@ -2,43 +2,47 @@ package tools
|
||||
|
||||
import (
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"go-admin/models"
|
||||
)
|
||||
|
||||
type SysColumns struct {
|
||||
ColumnId int64 `gorm:"column:column_id;primary_key" json:"columnId"`
|
||||
TableId int64 `gorm:"column:table_id" json:"tableId"`
|
||||
ColumnName string `gorm:"column:column_name" json:"columnName"`
|
||||
ColumnComment string `gorm:"column:column_comment" json:"columnComment"`
|
||||
ColumnType string `gorm:"column:column_type" json:"columnType"`
|
||||
GoType string `gorm:"column:go_type" json:"goType"`
|
||||
GoField string `gorm:"column:go_field" json:"goField"`
|
||||
JsonField string `gorm:"column:json_field" json:"jsonField"`
|
||||
IsPk string `gorm:"column:is_pk" json:"isPk"`
|
||||
IsIncrement string `gorm:"column:is_increment" json:"isIncrement"`
|
||||
IsRequired string `gorm:"column:is_required" json:"isRequired"`
|
||||
IsInsert string `gorm:"column:is_insert" json:"isInsert"`
|
||||
IsEdit string `gorm:"column:is_edit" json:"isEdit"`
|
||||
IsList string `gorm:"column:is_list" json:"isList"`
|
||||
IsQuery string `gorm:"column:is_query" json:"isQuery"`
|
||||
QueryType string `gorm:"column:query_type" json:"queryType"`
|
||||
HtmlType string `gorm:"column:html_type" json:"htmlType"`
|
||||
DictType string `gorm:"column:dict_type" json:"dictType"`
|
||||
Sort int `gorm:"column:sort" json:"sort"`
|
||||
List string `gorm:"column:list" json:"list"`
|
||||
Pk bool `gorm:"column:pk" json:"pk"`
|
||||
Required bool `gorm:"column:required" json:"required"`
|
||||
SuperColumn bool `gorm:"column:super_column" json:"superColumn"`
|
||||
UsableColumn bool `gorm:"column:usable_column" json:"usableColumn"`
|
||||
Increment bool `gorm:"column:increment" json:"increment"`
|
||||
Insert bool `gorm:"column:insert" json:"insert"`
|
||||
Edit bool `gorm:"column:edit" json:"edit"`
|
||||
Query bool `gorm:"column:query" json:"query"`
|
||||
Remark string `gorm:"column:remark" json:"remark"`
|
||||
CreateBy string `gorm:"column:create_by" json:"createBy"`
|
||||
CreateTime string `gorm:"column:create_time" json:"createTime"`
|
||||
UpdateBy string `gorm:"column:update_By" json:"updateBy"`
|
||||
UpdateTime string `gorm:"column:update_time" json:"updateTime"`
|
||||
ColumnId int `gorm:"primary_key;AUTO_INCREMENT" json:"columnId"`
|
||||
TableId int `gorm:"type:int(11);" json:"tableId"`
|
||||
ColumnName string `gorm:"type:varchar(128);" json:"columnName"`
|
||||
ColumnComment string `gorm:"column:column_comment;type:varchar(128);" json:"columnComment"`
|
||||
ColumnType string `gorm:"column:column_type;type:varchar(128);" json:"columnType"`
|
||||
GoType string `gorm:"column:go_type;type:varchar(128);" json:"goType"`
|
||||
GoField string `gorm:"column:go_field;type:varchar(128);" json:"goField"`
|
||||
JsonField string `gorm:"column:json_field;type:varchar(128);" json:"jsonField"`
|
||||
IsPk string `gorm:"column:is_pk;type:char(4);" json:"isPk"`
|
||||
IsIncrement string `gorm:"column:is_increment;type:char(4);" json:"isIncrement"`
|
||||
IsRequired string `gorm:"column:is_required;type:char(4);" json:"isRequired"`
|
||||
IsInsert string `gorm:"column:is_insert;type:char(4);" json:"isInsert"`
|
||||
IsEdit string `gorm:"column:is_edit;type:char(4);" json:"isEdit"`
|
||||
IsList string `gorm:"column:is_list;type:char(4);" json:"isList"`
|
||||
IsQuery string `gorm:"column:is_query;type:char(4);" json:"isQuery"`
|
||||
QueryType string `gorm:"column:query_type;type:varchar(128);" json:"queryType"`
|
||||
HtmlType string `gorm:"column:html_type;type:varchar(128);" json:"htmlType"`
|
||||
DictType string `gorm:"column:dict_type;type:varchar(128);" json:"dictType"`
|
||||
Sort int `gorm:"column:sort;type:int(4);" json:"sort"`
|
||||
List string `gorm:"column:list;type:char(1);" json:"list"`
|
||||
Pk bool `gorm:"column:pk;type:char(1);" json:"pk"`
|
||||
Required bool `gorm:"column:required;type:char(1);" json:"required"`
|
||||
SuperColumn bool `gorm:"column:super_column;type:char(1);" json:"superColumn"`
|
||||
UsableColumn bool `gorm:"column:usable_column;type:char(1);" json:"usableColumn"`
|
||||
Increment bool `gorm:"column:increment;type:char(1);" json:"increment"`
|
||||
Insert bool `gorm:"column:insert;type:char(1);" json:"insert"`
|
||||
Edit bool `gorm:"column:edit;type:char(1);" json:"edit"`
|
||||
Query bool `gorm:"column:query;type:char(1);" json:"query"`
|
||||
Remark string `gorm:"column:remark;type:varchar(255);" json:"remark"`
|
||||
CreateBy string `gorm:"column:create_by;type:varchar(128);" json:"createBy"`
|
||||
UpdateBy string `gorm:"column:update_By;type:varchar(128);" json:"updateBy"`
|
||||
|
||||
models.BaseModel
|
||||
}
|
||||
|
||||
func (SysColumns) TableName() string {
|
||||
return "sys_columns"
|
||||
}
|
||||
|
||||
func (e *SysColumns) GetList() ([]SysColumns, error) {
|
||||
@@ -56,7 +60,6 @@ func (e *SysColumns) GetList() ([]SysColumns, error) {
|
||||
|
||||
func (e *SysColumns) Create() (SysColumns, error) {
|
||||
var doc SysColumns
|
||||
e.CreateTime = utils.GetCurrntTime()
|
||||
result := orm.Eloquent.Table("sys_columns").Create(&e)
|
||||
if result.Error != nil {
|
||||
err := result.Error
|
||||
@@ -67,7 +70,6 @@ func (e *SysColumns) Create() (SysColumns, error) {
|
||||
}
|
||||
|
||||
func (e *SysColumns) Update() (update SysColumns, err error) {
|
||||
e.UpdateTime = utils.GetCurrntTime()
|
||||
if err = orm.Eloquent.Table("sys_columns").First(&update, e.ColumnId).Error; err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
+30
-42
@@ -2,49 +2,40 @@ package tools
|
||||
|
||||
import (
|
||||
orm "go-admin/database"
|
||||
"go-admin/utils"
|
||||
"go-admin/models"
|
||||
)
|
||||
|
||||
type SysTables struct {
|
||||
//表编码
|
||||
TableId int64 `gorm:"column:table_id;primary_key" json:"tableId"`
|
||||
//表名称
|
||||
TableName string `gorm:"column:table_name" json:"tableName"`
|
||||
//表备注
|
||||
TableComment string `gorm:"column:table_comment" json:"tableComment"`
|
||||
//类名
|
||||
ClassName string `gorm:"column:class_name" json:"className"`
|
||||
|
||||
TplCategory string `gorm:"column:tpl_category" json:"tplCategory"`
|
||||
//包名
|
||||
PackageName string `gorm:"column:package_name" json:"packageName"`
|
||||
//模块名
|
||||
ModuleName string `gorm:"column:module_name" json:"moduleName"`
|
||||
BusinessName string `gorm:"column:business_name" json:"businessName"`
|
||||
//功能名称
|
||||
FunctionName string `gorm:"column:function_name" json:"functionName"`
|
||||
//功能作者
|
||||
FunctionAuthor string `gorm:"column:function_author" json:"functionAuthor"`
|
||||
PkColumn string `gorm:"column:pk_column" json:"pkColumn"`
|
||||
PkGoField string `gorm:"column:pk_go_field" json:"pkGoField"`
|
||||
PkJsonField string `gorm:"column:pk_json_field" json:"pkJsonField"`
|
||||
Options string `gorm:"column:options" json:"options"`
|
||||
TreeCode string `gorm:"column:tree_code" json:"treeCode"`
|
||||
TreeParentCode string `gorm:"column:tree_parent_code" json:"treeParentCode"`
|
||||
TreeName string `gorm:"column:tree_name" json:"treeName"`
|
||||
Tree bool `gorm:"column:tree" json:"tree"`
|
||||
Crud bool `gorm:"column:crud" json:"crud"`
|
||||
Remark string `gorm:"column:remark" json:"remark"`
|
||||
IsLogicalDelete string `gorm:"column:is_logical_delete" json:"isLogicalDelete"`
|
||||
LogicalDelete bool `gorm:"column:logical_delete" json:"logicalDelete"`
|
||||
LogicalDeleteColumn string `gorm:"column:logical_delete_column" json:"logicalDeleteColumn"`
|
||||
CreateBy string `gorm:"column:create_by" json:"createBy"`
|
||||
CreateTime string `gorm:"column:create_time" json:"createTime"`
|
||||
UpdateBy string `gorm:"column:update_By" json:"updateBy"`
|
||||
UpdateTime string `gorm:"column:update_time" json:"updateTime"`
|
||||
TableId int `gorm:"primary_key;AUTO_INCREMENT" json:"tableId"` //表编码
|
||||
TableName string `gorm:"type:varchar(255);" json:"tableName"` //表名称
|
||||
TableComment string `gorm:"type:varchar(255);" json:"tableComment"` //表备注
|
||||
ClassName string `gorm:"type:varchar(255);" json:"className"` //类名
|
||||
TplCategory string `gorm:"type:varchar(255);" json:"tplCategory"`
|
||||
PackageName string `gorm:"type:varchar(255);" json:"packageName"` //包名
|
||||
ModuleName string `gorm:"type:varchar(255);" json:"moduleName"` //模块名
|
||||
BusinessName string `gorm:"type:varchar(255);" json:"businessName"`
|
||||
FunctionName string `gorm:"type:varchar(255);" json:"functionName"` //功能名称
|
||||
FunctionAuthor string `gorm:"type:varchar(255);" json:"functionAuthor"` //功能作者
|
||||
PkColumn string `gorm:"type:varchar(255);" json:"pkColumn"`
|
||||
PkGoField string `gorm:"type:varchar(255);" json:"pkGoField"`
|
||||
PkJsonField string `gorm:"type:varchar(255);" json:"pkJsonField"`
|
||||
Options string `gorm:"type:varchar(255);" json:"options"`
|
||||
TreeCode string `gorm:"type:varchar(255);" json:"treeCode"`
|
||||
TreeParentCode string `gorm:"type:varchar(255);" json:"treeParentCode"`
|
||||
TreeName string `gorm:"type:varchar(255);" json:"treeName"`
|
||||
Tree bool `gorm:"type:char(1);" json:"tree"`
|
||||
Crud bool `gorm:"type:char(1);" json:"crud"`
|
||||
Remark string `gorm:"type:varchar(255);" json:"remark"`
|
||||
IsLogicalDelete string `gorm:"type:char(1);" json:"isLogicalDelete"`
|
||||
LogicalDelete bool `gorm:"type:char(1);" json:"logicalDelete"`
|
||||
LogicalDeleteColumn string `gorm:"type:varchar(128);" json:"logicalDeleteColumn"`
|
||||
CreateBy string `gorm:"type:varchar(128);" json:"createBy"`
|
||||
UpdateBy string `gorm:"type:varchar(128);" json:"updateBy"`
|
||||
DataScope string `gorm:"-" json:"dataScope"`
|
||||
Params Params `gorm:"-" json:"params"`
|
||||
Columns []SysColumns `gorm:"-" json:"columns"`
|
||||
|
||||
models.BaseModel
|
||||
}
|
||||
|
||||
type Params struct {
|
||||
@@ -53,7 +44,7 @@ type Params struct {
|
||||
TreeName string `gorm:"-" json:"treeName"`
|
||||
}
|
||||
|
||||
func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int32, error) {
|
||||
func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, error) {
|
||||
var doc []SysTables
|
||||
|
||||
table := orm.Eloquent.Select("*").Table("sys_tables")
|
||||
@@ -65,7 +56,7 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int32, er
|
||||
table = table.Where("table_comment = ?", e.TableComment)
|
||||
}
|
||||
|
||||
var count int32
|
||||
var count int
|
||||
|
||||
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
|
||||
return nil, 0, err
|
||||
@@ -103,8 +94,6 @@ func (e *SysTables) Get() (SysTables, error) {
|
||||
|
||||
func (e *SysTables) Create() (SysTables, error) {
|
||||
var doc SysTables
|
||||
e.CreateTime = utils.GetCurrntTime()
|
||||
e.UpdateTime = utils.GetCurrntTime()
|
||||
result := orm.Eloquent.Table("sys_tables").Create(&e)
|
||||
if result.Error != nil {
|
||||
err := result.Error
|
||||
@@ -121,7 +110,6 @@ func (e *SysTables) Create() (SysTables, error) {
|
||||
}
|
||||
|
||||
func (e *SysTables) Update() (update SysTables, err error) {
|
||||
e.UpdateTime = utils.GetCurrntTime()
|
||||
if err = orm.Eloquent.Table("sys_tables").First(&update, e.TableId).Error; err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user