mirror of
https://gitee.com/XM-GO/PandaX.git
synced 2026-04-23 02:48:34 +08:00
【新增】租户功能
This commit is contained in:
PandaGoAdmin
100
apps/system/api/tenant.go
Normal file
100
apps/system/api/tenant.go
Normal file
@@ -0,0 +1,100 @@
|
||||
package api
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author 熊猫
|
||||
* @Date 2022/7/14 17:55
|
||||
**/
|
||||
import (
|
||||
"pandax/apps/system/entity"
|
||||
"pandax/apps/system/services"
|
||||
"pandax/base/ctx"
|
||||
"pandax/base/ginx"
|
||||
"pandax/base/utils"
|
||||
)
|
||||
|
||||
type SysTenantsApi struct {
|
||||
SysTenantsApp services.SysTenantsModel
|
||||
}
|
||||
|
||||
// @Summary SysTenants列表数据
|
||||
// @Tags SysTenants
|
||||
// @Param pageSize query int false "页条数"
|
||||
// @Param pageNum query int false "页码"
|
||||
// @Success 200 {string} string "{"code": 200, "data": [...]}"
|
||||
// @Router /admin/sysTenants/list [get]
|
||||
// @Security
|
||||
func (p *SysTenantsApi) GetSysTenantsList(rc *ctx.ReqCtx) {
|
||||
data := entity.SysTenants{}
|
||||
pageNum := ginx.QueryInt(rc.GinCtx, "pageNum", 1)
|
||||
pageSize := ginx.QueryInt(rc.GinCtx, "pageSize", 10)
|
||||
|
||||
list, total := p.SysTenantsApp.FindListPage(pageNum, pageSize, data)
|
||||
|
||||
rc.ResData = map[string]interface{}{
|
||||
"data": list,
|
||||
"total": total,
|
||||
"pageNum": pageNum,
|
||||
"pageSize": pageSize,
|
||||
}
|
||||
}
|
||||
|
||||
// @Summary 获取SysTenants
|
||||
// @Description 获取JSON
|
||||
// @Tags SysTenants
|
||||
// @Param tenantId path int true "tenantId"
|
||||
// @Success 200 {string} string "{"code": 200, "data": [...]}"
|
||||
// @Router /admin/sysTenants/{tenantId} [get]
|
||||
// @Security
|
||||
func (p *SysTenantsApi) GetSysTenants(rc *ctx.ReqCtx) {
|
||||
tenantId := ginx.PathParamInt(rc.GinCtx, "tenantId")
|
||||
p.SysTenantsApp.FindOne(int64(tenantId))
|
||||
}
|
||||
|
||||
// @Summary 添加SysTenants
|
||||
// @Description 获取JSON
|
||||
// @Tags SysTenants
|
||||
// @Accept application/json
|
||||
// @Product application/json
|
||||
// @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]
|
||||
// @Security X-TOKEN
|
||||
func (p *SysTenantsApi) InsertSysTenants(rc *ctx.ReqCtx) {
|
||||
var data entity.SysTenants
|
||||
ginx.BindJsonAndValid(rc.GinCtx, &data)
|
||||
|
||||
p.SysTenantsApp.Insert(data)
|
||||
}
|
||||
|
||||
// @Summary 修改SysTenants
|
||||
// @Description 获取JSON
|
||||
// @Tags SysTenants
|
||||
// @Accept application/json
|
||||
// @Product application/json
|
||||
// @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]
|
||||
// @Security X-TOKEN
|
||||
func (p *SysTenantsApi) UpdateSysTenants(rc *ctx.ReqCtx) {
|
||||
var data entity.SysTenants
|
||||
ginx.BindJsonAndValid(rc.GinCtx, &data)
|
||||
|
||||
p.SysTenantsApp.Update(data)
|
||||
}
|
||||
|
||||
// @Summary 删除SysTenants
|
||||
// @Description 删除数据
|
||||
// @Tags SysTenants
|
||||
// @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]
|
||||
func (p *SysTenantsApi) DeleteSysTenants(rc *ctx.ReqCtx) {
|
||||
|
||||
tenantId := rc.GinCtx.Param("tenantId")
|
||||
tenantIds := utils.IdsStrToIdsIntGroup(tenantId)
|
||||
p.SysTenantsApp.Delete(tenantIds)
|
||||
}
|
||||
@@ -6,20 +6,19 @@ import (
|
||||
)
|
||||
|
||||
type SysRole struct {
|
||||
model.BaseModel
|
||||
RoleId int64 `json:"roleId" gorm:"primary_key;AUTO_INCREMENT"`
|
||||
RoleName string `json:"roleName" gorm:"type:varchar(128);comment:角色名称"`
|
||||
Status string `json:"status" gorm:"type:varchar(1);comment:状态"`
|
||||
RoleKey string `json:"roleKey" gorm:"type:varchar(128);comment:角色代码"`
|
||||
RoleSort int64 `json:"roleSort" gorm:"type:int;comment:角色排序"`
|
||||
DataScope string `json:"dataScope" gorm:"type:varchar(1);comment:数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）"`
|
||||
Flag string `json:"flag" gorm:"type:varchar(128);comment:删除标识"`
|
||||
CreateBy string `json:"createBy" gorm:"type:varchar(128);"`
|
||||
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"`
|
||||
Remark string `json:"remark" gorm:"type:varchar(255);"`
|
||||
CreateBy string `json:"createBy" gorm:"type:varchar(128);comment:创建人"`
|
||||
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);comment:修改人"`
|
||||
Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"`
|
||||
ApiIds []casbin.CasbinRule `json:"apiIds" gorm:"-"`
|
||||
MenuIds []int64 `json:"menuIds" gorm:"-"`
|
||||
DeptIds []int64 `json:"deptIds" gorm:"-"`
|
||||
model.BaseModel
|
||||
}
|
||||
|
||||
type MenuIdList struct {
|
||||
|
||||
24
apps/system/entity/tenant.go
Normal file
24
apps/system/entity/tenant.go
Normal file
@@ -0,0 +1,24 @@
|
||||
package entity
|
||||
|
||||
import (
|
||||
"pandax/base/model"
|
||||
"time"
|
||||
)
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author 熊猫
|
||||
* @Date 2022/7/14 16:14
|
||||
**/
|
||||
|
||||
type SysTenants struct {
|
||||
model.BaseModel
|
||||
TenantId int64 `json:"tenantId" gorm:"primary_key;AUTO_INCREMENT"`
|
||||
TenantName string `json:"tenantName" gorm:"type:varchar(255);comment:租户名"`
|
||||
Remark string `json:"remark" gorm:"type:varchar(255);comment:备注"`
|
||||
ExpireTime time.Time `json:"expireTime" gorm:"comment:过期时间"`
|
||||
}
|
||||
|
||||
func (SysTenants) TableName() string {
|
||||
return "sys_tenants"
|
||||
}
|
||||
46
apps/system/router/tenant.go
Normal file
46
apps/system/router/tenant.go
Normal file
@@ -0,0 +1,46 @@
|
||||
package router
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author 熊猫
|
||||
* @Date 2022/7/14 17:52
|
||||
**/
|
||||
|
||||
import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"pandax/apps/system/api"
|
||||
"pandax/apps/system/services"
|
||||
"pandax/base/ctx"
|
||||
)
|
||||
|
||||
func InitSysTenantRouter(router *gin.RouterGroup) {
|
||||
s := &api.SysTenantsApi{
|
||||
SysTenantsApp: services.SysTenantModelDao,
|
||||
}
|
||||
routerGroup := router.Group("SysTenant")
|
||||
|
||||
SysTenantListLog := ctx.NewLogInfo("获取SysTenant分页列表")
|
||||
routerGroup.GET("list", func(c *gin.Context) {
|
||||
ctx.NewReqCtxWithGin(c).WithLog(SysTenantListLog).Handle(s.GetSysTenantsList)
|
||||
})
|
||||
|
||||
SysTenantLog := ctx.NewLogInfo("获取SysTenant信息")
|
||||
routerGroup.GET(":tenantId", func(c *gin.Context) {
|
||||
ctx.NewReqCtxWithGin(c).WithLog(SysTenantLog).Handle(s.GetSysTenants)
|
||||
})
|
||||
|
||||
insertSysTenantLog := ctx.NewLogInfo("添加SysTenant信息")
|
||||
routerGroup.POST("", func(c *gin.Context) {
|
||||
ctx.NewReqCtxWithGin(c).WithLog(insertSysTenantLog).Handle(s.InsertSysTenants)
|
||||
})
|
||||
|
||||
updateSysTenantLog := ctx.NewLogInfo("修改SysTenant信息")
|
||||
routerGroup.PUT("", func(c *gin.Context) {
|
||||
ctx.NewReqCtxWithGin(c).WithLog(updateSysTenantLog).Handle(s.UpdateSysTenants)
|
||||
})
|
||||
|
||||
deleteSysTenantLog := ctx.NewLogInfo("删除SysTenant信息")
|
||||
routerGroup.DELETE(":tenantId", func(c *gin.Context) {
|
||||
ctx.NewReqCtxWithGin(c).WithLog(deleteSysTenantLog).Handle(s.DeleteSysTenants)
|
||||
})
|
||||
}
|
||||
81
apps/system/services/tenant.go
Normal file
81
apps/system/services/tenant.go
Normal file
@@ -0,0 +1,81 @@
|
||||
package services
|
||||
|
||||
/**
|
||||
* @Description
|
||||
* @Author 熊猫
|
||||
* @Date 2022/7/14 17:49
|
||||
**/
|
||||
import (
|
||||
"pandax/apps/system/entity"
|
||||
"pandax/base/biz"
|
||||
"pandax/base/global"
|
||||
)
|
||||
|
||||
type (
|
||||
SysTenantsModel interface {
|
||||
Insert(data entity.SysTenants) *entity.SysTenants
|
||||
FindOne(tenantId int64) *entity.SysTenants
|
||||
FindListPage(page, pageSize int, data entity.SysTenants) (*[]entity.SysTenants, int64)
|
||||
FindList(data entity.SysTenants) *[]entity.SysTenants
|
||||
Update(data entity.SysTenants) *entity.SysTenants
|
||||
Delete(tenantIds []int64)
|
||||
}
|
||||
|
||||
SysTenantModelImpl struct {
|
||||
table string
|
||||
}
|
||||
)
|
||||
|
||||
var SysTenantModelDao SysTenantsModel = &SysTenantModelImpl{
|
||||
table: `sys_tenants`,
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) Insert(data entity.SysTenants) *entity.SysTenants {
|
||||
err := global.Db.Table(m.table).Create(&data).Error
|
||||
biz.ErrIsNil(err, "添加SysTenant失败")
|
||||
return &data
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) FindOne(tenantId int64) *entity.SysTenants {
|
||||
resData := new(entity.SysTenants)
|
||||
err := global.Db.Table(m.table).Where("tenant_id = ?", tenantId).First(resData).Error
|
||||
biz.ErrIsNil(err, "查询SysTenant失败")
|
||||
return resData
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) FindListPage(page, pageSize int, data entity.SysTenants) (*[]entity.SysTenants, int64) {
|
||||
list := make([]entity.SysTenants, 0)
|
||||
var total int64 = 0
|
||||
offset := pageSize * (page - 1)
|
||||
db := global.Db.Table(m.table)
|
||||
// 此处填写 where参数判断
|
||||
if data.TenantId != 0 {
|
||||
db = db.Where("tenant_id = ?", data.TenantId)
|
||||
}
|
||||
db.Where("delete_time IS NULL")
|
||||
err := db.Count(&total).Error
|
||||
err = db.Order("create_time").Limit(pageSize).Offset(offset).Find(&list).Error
|
||||
biz.ErrIsNil(err, "查询SysTenant分页列表失败")
|
||||
return &list, total
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) FindList(data entity.SysTenants) *[]entity.SysTenants {
|
||||
list := make([]entity.SysTenants, 0)
|
||||
db := global.Db.Table(m.table)
|
||||
// 此处填写 where参数判断
|
||||
if data.TenantId != 0 {
|
||||
db = db.Where("tenant_id = ?", data.TenantId)
|
||||
}
|
||||
db.Where("delete_time IS NULL")
|
||||
biz.ErrIsNil(db.Order("create_time").Find(&list).Error, "查询SysTenant列表失败")
|
||||
return &list
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) Update(data entity.SysTenants) *entity.SysTenants {
|
||||
biz.ErrIsNil(global.Db.Table(m.table).Updates(&data).Error, "修改SysTenant失败")
|
||||
return &data
|
||||
}
|
||||
|
||||
func (m *SysTenantModelImpl) Delete(tenantIds []int64) {
|
||||
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.SysTenants{}, "tenant_id in (?)", tenantIds).Error, "删除SysTenant失败")
|
||||
}
|
||||
Reference in New Issue
Block a user