diff --git a/app/admin/apis/sysfile/dir.go b/app/admin/apis/sysfile/dir.go deleted file mode 100644 index 54d10b3..0000000 --- a/app/admin/apis/sysfile/dir.go +++ /dev/null @@ -1,71 +0,0 @@ -package sysfile - -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" - "go-admin/tools/app/msg" -) - -func GetSysFileDirList(c *gin.Context) { - var SysFileDir models.SysFileDirOld - SysFileDir.Label = c.Request.FormValue("label") - SysFileDir.PId, _ = tools.StringToInt(c.Request.FormValue("pid")) - SysFileDir.Id, _ = tools.StringToInt(c.Request.FormValue("id")) - SysFileDir.DataScope = tools.GetUserIdStr(c) - result, err := SysFileDir.SetSysFileDirOld() - tools.HasError(err, "抱歉未找到相关信息", -1) - app.OK(c, result, "") -} - -func GetSysFileDir(c *gin.Context) { - var data models.SysFileDirOld - data.Id, _ = tools.StringToInt(c.Param("id")) - result, err := data.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - - app.OK(c, result, "") -} - -// @Summary 添加SysFileDir -// @Description 获取JSON -// @Tags SysFileDir -// @Accept application/json -// @Product application/json -// @Param data body models.SysFileDir true "data" -// @Success 200 {string} string "{"code": 200, "message": "添加成功"}" -// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" -// @Router /api/v1/sysfiledir [post] -func InsertSysFileDir(c *gin.Context) { - var data models.SysFileDirOld - err := c.ShouldBindJSON(&data) - data.CreateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", 500) - result, err := data.Create() - tools.HasError(err, "", -1) - app.OK(c, result, "") -} - -func UpdateSysFileDir(c *gin.Context) { - var data models.SysFileDirOld - err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "数据解析失败", -1) - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.Update(data.Id) - tools.HasError(err, "", -1) - - app.OK(c, result, "") -} - -func DeleteSysFileDir(c *gin.Context) { - var data models.SysFileDirOld - data.UpdateBy = tools.GetUserIdStr(c) - - IDS := tools.IdsStrToIdsIntGroup("id", c) - _, err := data.BatchDelete(IDS) - tools.HasError(err, msg.DeletedFail, 500) - app.OK(c, nil, msg.DeletedSuccess) -} diff --git a/app/admin/apis/sysfile/sysfileinfo.go b/app/admin/apis/sysfile/sysfileinfo.go deleted file mode 100644 index 8870873..0000000 --- a/app/admin/apis/sysfile/sysfileinfo.go +++ /dev/null @@ -1,77 +0,0 @@ -package sysfile - -import ( - "github.com/gin-gonic/gin" - "github.com/gin-gonic/gin/binding" - - "go-admin/app/admin/models" - "go-admin/tools" - "go-admin/tools/app" - "go-admin/tools/app/msg" -) - -func GetSysFileInfoOldList(c *gin.Context) { - var data models.SysFileInfoOld - var err error - var pageSize = 10 - var pageIndex = 1 - - if size := c.Request.FormValue("pageSize"); size != "" { - pageSize, err = tools.StringToInt(size) - } - tools.HasError(err, "", -1) - if index := c.Request.FormValue("pageIndex"); index != "" { - pageIndex, err = tools.StringToInt(index) - } - tools.HasError(err, "", -1) - if pid := c.Request.FormValue("pId"); pid != "" { - data.PId, err = tools.StringToInt(pid) - } - tools.HasError(err, "", -1) - - data.DataScope = tools.GetUserIdStr(c) - result, count, err := data.GetPage(pageSize, pageIndex) - tools.HasError(err, "", -1) - - app.PageOK(c, result, count, pageIndex, pageSize, "") -} - -func GetSysFileInfoOld(c *gin.Context) { - var data models.SysFileInfoOld - data.Id, _ = tools.StringToInt(c.Param("id")) - result, err := data.Get() - tools.HasError(err, "抱歉未找到相关信息", -1) - - app.OK(c, result, "") -} - -func InsertSysFileInfoOld(c *gin.Context) { - var data models.SysFileInfoOld - err := c.ShouldBindJSON(&data) - data.CreateBy = tools.GetUserIdStr(c) - tools.HasError(err, "", 500) - result, err := data.Create() - tools.HasError(err, "", -1) - app.OK(c, result, "") -} - -func UpdateSysFileInfoOld(c *gin.Context) { - var data models.SysFileInfoOld - err := c.BindWith(&data, binding.JSON) - tools.HasError(err, "数据解析失败", -1) - data.UpdateBy = tools.GetUserIdStr(c) - result, err := data.Update(data.Id) - tools.HasError(err, "", -1) - - app.OK(c, result, "") -} - -func DeleteSysFileInfoOld(c *gin.Context) { - var data models.SysFileInfoOld - data.UpdateBy = tools.GetUserIdStr(c) - - IDS := tools.IdsStrToIdsIntGroup("id", c) - _, err := data.BatchDelete(IDS) - tools.HasError(err, msg.DeletedFail, 500) - app.OK(c, nil, msg.DeletedSuccess) -} diff --git a/app/admin/apis/system/dict/dicttype.go b/app/admin/apis/system/dict/dicttype.go index bf9fe50..2a09b0e 100644 --- a/app/admin/apis/system/dict/dicttype.go +++ b/app/admin/apis/system/dict/dicttype.go @@ -19,7 +19,7 @@ import ( // @Param dictType query string false "dictType" // @Param pageSize query int false "页条数" // @Param pageIndex query int false "页码" -// @Success 200 {object} app.PageResponse "{"code": 200, "data": [...]}" +// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" // @Router /api/v1/dict/type/list [get] // @Security Bearer func GetDictTypeList(c *gin.Context) { diff --git a/app/admin/models/filedir.go b/app/admin/models/filedir.go deleted file mode 100644 index eb70934..0000000 --- a/app/admin/models/filedir.go +++ /dev/null @@ -1,163 +0,0 @@ -package models - -import ( - orm "go-admin/common/global" - "go-admin/tools" -) - -type SysFileDirOld struct { - Id int `json:"id"` - Label string `json:"label" gorm:"type:varchar(255);"` // 名称 - PId int `json:"pId" gorm:"type:int(11);"` // 父id - Sort int `json:"sort" gorm:""` //排序 - Path string `json:"path" gorm:"size:255;"` // - CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人 - UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人 - Children []SysFileDirOld `json:"children" gorm:"-"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - BaseModel -} - -func (SysFileDirOld) TableName() string { - return "sys_file_dir" -} - -// 创建SysFileDirOld -func (e *SysFileDirOld) Create() (SysFileDirOld, error) { - var doc SysFileDirOld - result := orm.Eloquent.Table(e.TableName()).Create(&e) - if result.Error != nil { - err := result.Error - return doc, err - } - - path := "/" + tools.IntToString(e.Id) - if int(e.PId) != 0 { - var deptP SysFileDirOld - orm.Eloquent.Table(e.TableName()).Where("id = ?", e.PId).First(&deptP) - path = deptP.Path + path - } else { - path = "/0" + path - } - var mp = map[string]string{} - mp["path"] = path - if err := orm.Eloquent.Table(e.TableName()).Where("id = ?", e.Id).Updates(mp).Error; err != nil { - err := result.Error - return doc, err - } - doc = *e - doc.Path = path - - return doc, nil -} - -// 获取SysFileDirOld -func (e *SysFileDirOld) Get() (SysFileDirOld, error) { - var doc SysFileDirOld - table := orm.Eloquent.Table(e.TableName()) - - if e.Id != 0 { - table = table.Where("id = ?", e.Id) - } - - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -// 获取SysFileDirOld带分页 -func (e *SysFileDirOld) GetPage() ([]SysFileDirOld, int, error) { - var doc []SysFileDirOld - - table := orm.Eloquent.Table(e.TableName()) - var count int64 - - if err := table.Find(&doc).Error; err != nil { - return nil, 0, err - } - table.Where("`deleted_at` IS NULL").Count(&count) - return doc, int(count), nil -} - -// 更新SysFileDirOld -func (e *SysFileDirOld) Update(id int) (update SysFileDirOld, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).First(&update).Error; err != nil { - return - } - - path := "/" + tools.IntToString(e.Id) - if int(e.Id) != 0 { - var deptP SysFileDirOld - orm.Eloquent.Table(e.TableName()).Where("id = ?", e.Id).First(&deptP) - path = deptP.Path + path - } else { - path = "/0" + path - } - e.Path = path - - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - return -} - -// 删除SysFileDirOld -func (e *SysFileDirOld) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).Delete(&SysFileDirOld{}).Error; err != nil { - success = false - return - } - success = true - return -} - -//批量删除 -func (e *SysFileDirOld) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id in (?)", id).Delete(&SysFileDirOld{}).Error; err != nil { - return - } - Result = true - return -} - -func (e *SysFileDirOld) SetSysFileDirOld() ([]SysFileDirOld, error) { - list, _, err := e.GetPage() - - m := make([]SysFileDirOld, 0) - for i := 0; i < len(list); i++ { - if list[i].PId != 0 { - continue - } - info := SysFileDirOldDigui(&list, list[i]) - - m = append(m, info) - } - return m, err -} - -func SysFileDirOldDigui(deptlist *[]SysFileDirOld, menu SysFileDirOld) SysFileDirOld { - list := *deptlist - - min := make([]SysFileDirOld, 0) - for j := 0; j < len(list); j++ { - - if menu.Id != list[j].PId { - continue - } - mi := SysFileDirOld{} - mi.Id = list[j].Id - mi.PId = list[j].PId - mi.Label = list[j].Label - mi.Sort = list[j].Sort - mi.CreatedAt = list[j].CreatedAt - mi.UpdatedAt = list[j].UpdatedAt - mi.Children = []SysFileDirOld{} - ms := SysFileDirOldDigui(deptlist, mi) - min = append(min, ms) - - } - menu.Children = min - return menu -} diff --git a/app/admin/models/sys_file_dir.go b/app/admin/models/sys_file_dir.go index 1254d43..4b167d1 100644 --- a/app/admin/models/sys_file_dir.go +++ b/app/admin/models/sys_file_dir.go @@ -13,18 +13,18 @@ type SysFileDir struct { Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 PId uint `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 //Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 - Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 + Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 } type SysFileDirL struct { gorm.Model models.ControlBy - Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 - PId uint `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 + Label string `json:"label" gorm:"type:varchar(255);comment:目录名称"` // 目录名称 + PId uint `json:"pId" gorm:"type:int(11);comment:上级目录"` // 上级目录 //Sort string `json:"sort" gorm:"type:bigint(20);comment:排序"` // 排序 - Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 - Children []SysFileDirL `json:"children" gorm:"-"` // 下级信息 + Path string `json:"path" gorm:"type:varchar(255);comment:路径"` // 路径 + Children []SysFileDirL `json:"children" gorm:"-"` // 下级信息 } func (SysFileDir) TableName() string { /**/ diff --git a/app/admin/models/sysfileinfo.go b/app/admin/models/sysfileinfo.go deleted file mode 100644 index 6b7bfa8..0000000 --- a/app/admin/models/sysfileinfo.go +++ /dev/null @@ -1,111 +0,0 @@ -package models - -import ( - orm "go-admin/common/global" -) - -type SysFileInfoOld struct { - Id int `json:"id"` // id - Type string `json:"type" gorm:"type:varchar(255);"` // 文件类型 - Name string `json:"name" gorm:"type:varchar(255);"` // 文件名称 - Size string `json:"size" gorm:"type:int(11);"` // 文件大小 - PId int `json:"pId" gorm:"type:int(11);"` // 目录id - Source string `json:"source" gorm:"type:varchar(255);"` // 文件源 - Url string `json:"url" gorm:"type:varchar(255);"` // 文件路径 - FullUrl string `json:"fullUrl" gorm:"type:varchar(255);"` // 文件全路径 - CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人 - UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人 - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - BaseModel -} - -func (SysFileInfoOld) TableName() string { - return "sys_file_info" -} - -// 创建SysFileInfoOld -func (e *SysFileInfoOld) Create() (SysFileInfoOld, error) { - var doc SysFileInfoOld - result := orm.Eloquent.Table(e.TableName()).Create(&e) - if result.Error != nil { - err := result.Error - return doc, err - } - doc = *e - return doc, nil -} - -// 获取SysFileInfoOld -func (e *SysFileInfoOld) Get() (SysFileInfoOld, error) { - var doc SysFileInfoOld - table := orm.Eloquent.Table(e.TableName()) - - if e.Id != 0 { - table = table.Where("id = ?", e.Id) - } - - if err := table.First(&doc).Error; err != nil { - return doc, err - } - return doc, nil -} - -// 获取SysFileInfoOld带分页 -func (e *SysFileInfoOld) GetPage(pageSize int, pageIndex int) ([]SysFileInfoOld, int, error) { - var doc []SysFileInfoOld - - table := orm.Eloquent.Table(e.TableName()) - - if e.PId != 0 { - table = table.Where("p_id = ?", e.PId) - } - - // 数据权限控制(如果不需要数据权限请将此处去掉) - //dataPermission := new(DataPermission) - //dataPermission.UserId, _ = tools.StringToInt(e.DataScope) - //table, err := dataPermission.GetDataScope(e.TableName(), table) - //if err != nil { - // return nil, 0, err - //} - var count int64 - - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { - return nil, 0, err - } - //table.Where("`deleted_at` IS NULL").Count(&count) - return doc, int(count), nil -} - -// 更新SysFileInfoOld -func (e *SysFileInfoOld) Update(id int) (update SysFileInfoOld, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).First(&update).Error; err != nil { - return - } - - //参数1:是要修改的数据 - //参数2:是修改的数据 - if err = orm.Eloquent.Table(e.TableName()).Model(&update).Updates(&e).Error; err != nil { - return - } - return -} - -// 删除SysFileInfoOld -func (e *SysFileInfoOld) Delete(id int) (success bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id = ?", id).Delete(&SysFileInfoOld{}).Error; err != nil { - success = false - return - } - success = true - return -} - -//批量删除 -func (e *SysFileInfoOld) BatchDelete(id []int) (Result bool, err error) { - if err = orm.Eloquent.Table(e.TableName()).Where("id in (?)", id).Delete(&SysFileInfoOld{}).Error; err != nil { - return - } - Result = true - return -}