public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-05-06 12:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

[修复]代码生成

Browse Source
This commit is contained in:
PandaGoAdmin
2022-07-17 01:26:42 +08:00
parent c33f6f816b
commit d33bd39570
12 changed files with 153 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/system/api/tenant.go
View File

@@ -22,7 +22,7 @@ type SysTenantsApi struct {
// @Param pageSize query int false "页条数"
// @Param pageNum query int false "页码"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /admin/sysTenants/list [get]
// @Router /admin/tenant/list [get]
// @Security
func (p *SysTenantsApi) GetSysTenantsList(rc *ctx.ReqCtx) {
data := entity.SysTenants{}
@@ -44,7 +44,7 @@ func (p *SysTenantsApi) GetSysTenantsList(rc *ctx.ReqCtx) {
// @Tags SysTenants
// @Param tenantId path int true "tenantId"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /admin/sysTenants/{tenantId} [get]
// @Router /admin/tenant/{tenantId} [get]
// @Security
func (p *SysTenantsApi) GetSysTenants(rc *ctx.ReqCtx) {
tenantId := ginx.PathParamInt(rc.GinCtx, "tenantId")
@@ -59,7 +59,7 @@ func (p *SysTenantsApi) GetSysTenants(rc *ctx.ReqCtx) {
// @Param data body entity.SysTenants true "data"
// @Success 200 {string} string "{"code": 200, "message": "添加成功"}"
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /admin/sysTenants [post]
// @Router /admin/tenant [post]
// @Security X-TOKEN
func (p *SysTenantsApi) InsertSysTenants(rc *ctx.ReqCtx) {
var data entity.SysTenants
@@ -76,7 +76,7 @@ func (p *SysTenantsApi) InsertSysTenants(rc *ctx.ReqCtx) {
// @Param data body entity.SysTenants true "body"
// @Success 200 {string} string "{"code": 200, "message": "添加成功"}"
// @Success 200 {string} string "{"code": 400, "message": "添加失败"}"
// @Router /admin/sysTenants [put]
// @Router /admin/tenant [put]
// @Security X-TOKEN
func (p *SysTenantsApi) UpdateSysTenants(rc *ctx.ReqCtx) {
var data entity.SysTenants
@@ -91,9 +91,8 @@ func (p *SysTenantsApi) UpdateSysTenants(rc *ctx.ReqCtx) {
// @Param tenantId path string true "tenantId"
// @Success 200 {string} string "{"code": 200, "message": "删除成功"}"
// @Success 200 {string} string "{"code": 400, "message": "删除失败"}"
// @Router /admin/sysTenants/{tenantId} [delete]
// @Router /admin/tenant/{tenantId} [delete]
func (p *SysTenantsApi) DeleteSysTenants(rc *ctx.ReqCtx) {
tenantId := rc.GinCtx.Param("tenantId")
tenantIds := utils.IdsStrToIdsIntGroup(tenantId)
p.SysTenantsApp.Delete(tenantIds)

2
apps/system/router/api.go
View File

@@ -9,7 +9,7 @@ import (
func InitApiRouter(router *gin.RouterGroup) {
s := &api.SystemApiApi{
ApiApp: services.SysSysApiModelDao,
ApiApp: services.SysApiModelDao,
}
api := router.Group("api")

16
apps/system/services/api.go
View File

@@ -19,16 +19,16 @@ type (
Delete(ids []int64)
}
sysSysApiModelImpl struct {
sysApiModelImpl struct {
table string
}
)
var SysSysApiModelDao SysApiModel = &sysSysApiModelImpl{
var SysApiModelDao SysApiModel = &sysApiModelImpl{
table: `sys_apis`,
}
func (m *sysSysApiModelImpl) Insert(api entity.SysApi) *entity.SysApi {
func (m *sysApiModelImpl) Insert(api entity.SysApi) *entity.SysApi {
err := global.Db.Table(m.table).Where("path = ? AND method = ?", api.Path, api.Method).First(&entity.SysApi{}).Error
biz.IsTrue(errors.Is(err, gorm.ErrRecordNotFound), "存在相同api")
err = global.Db.Table(m.table).Create(&api).Error
@@ -36,14 +36,14 @@ func (m *sysSysApiModelImpl) Insert(api entity.SysApi) *entity.SysApi {
return &api
}
func (m *sysSysApiModelImpl) FindOne(id int64) (resData *entity.SysApi) {
func (m *sysApiModelImpl) FindOne(id int64) (resData *entity.SysApi) {
resData = new(entity.SysApi)
err := global.Db.Table(m.table).Where("id = ?", id).First(&resData).Error
biz.ErrIsNil(err, "查询Api失败")
return
}
func (m *sysSysApiModelImpl) FindListPage(page, pageSize int, data entity.SysApi) (*[]entity.SysApi, int64) {
func (m *sysApiModelImpl) FindListPage(page, pageSize int, data entity.SysApi) (*[]entity.SysApi, int64) {
list := make([]entity.SysApi, 0)
var total int64 = 0
offset := pageSize * (page - 1)
@@ -73,7 +73,7 @@ func (m *sysSysApiModelImpl) FindListPage(page, pageSize int, data entity.SysApi
return &list, total
}
func (m *sysSysApiModelImpl) FindList(data entity.SysApi) *[]entity.SysApi {
func (m *sysApiModelImpl) FindList(data entity.SysApi) *[]entity.SysApi {
list := make([]entity.SysApi, 0)
db := global.Db.Table(m.table)
@@ -98,7 +98,7 @@ func (m *sysSysApiModelImpl) FindList(data entity.SysApi) *[]entity.SysApi {
return &list
}
func (m *sysSysApiModelImpl) Update(api entity.SysApi) *entity.SysApi {
func (m *sysApiModelImpl) Update(api entity.SysApi) *entity.SysApi {
var oldA entity.SysApi
err := global.Db.Table(m.table).Where("id = ?", api.Id).First(&oldA).Error
biz.ErrIsNil(err, "【修改api】查询api失败")
@@ -113,7 +113,7 @@ func (m *sysSysApiModelImpl) Update(api entity.SysApi) *entity.SysApi {
return &api
}
func (m *sysSysApiModelImpl) Delete(ids []int64) {
func (m *sysApiModelImpl) Delete(ids []int64) {
err := global.Db.Table(m.table).Delete(&entity.SysApi{}, "id in (?)", ids).Error
biz.ErrIsNil(err, "删除配置信息失败")
}

1
apps/system/services/menu.go
View File

@@ -32,7 +32,6 @@ var SysMenuModelDao SysMenuModel = &sysMenuModelImpl{
func (m *sysMenuModelImpl) Insert(data entity.SysMenu) *entity.SysMenu {
err := global.Db.Table(m.table).Create(&data).Error
biz.ErrIsNil(err, "添加菜单失败")
//m.InitPaths(&data)
return &data
}