更新uniapp和platform
This commit is contained in:
1 parent
31ae07175d
commit
7f9a66da0f
47 files changed
+5207
-1974
No files matched your search
@@ -272,6 +272,15 @@ func (c *AppOaController) uploadTenantImage() {
|
||||
return
|
||||
}
|
||||
|
||||
// 附件空间校验:OA 附件同样占用租户额度
|
||||
if qerr := services.EnsureTenantStorageQuota(tid, uint64(staged.Size)); qerr != nil {
|
||||
if respondStorageQuotaError(&c.Controller, qerr) {
|
||||
return
|
||||
}
|
||||
c.oaErr(500, 500, "附件空间校验失败")
|
||||
return
|
||||
}
|
||||
|
||||
result, err := storage.Commit(staged, ctx)
|
||||
if err != nil {
|
||||
c.oaErr(500, 500, "上传失败,请重试")
|
||||
|
||||
@@ -575,6 +575,16 @@ func (c *BackendFileController) UploadFile() {
|
||||
return
|
||||
}
|
||||
|
||||
// 2.1 附件空间校验:重复文件不占空间,所以放在查重之后、落盘之前。
|
||||
// 平台端上传(source=platform)不占租户额度,这里只管租户端上传。
|
||||
if qerr := services.EnsureTenantStorageQuota(tid, uint64(staged.Size)); qerr != nil {
|
||||
if respondStorageQuotaError(&c.Controller, qerr) {
|
||||
return
|
||||
}
|
||||
c.jsonErr(500, 500, "附件空间校验失败: "+qerr.Error())
|
||||
return
|
||||
}
|
||||
|
||||
// 3. 提交到正式目录:backend/{tid}[/{tuid}]/yyyy/MM/dd/
|
||||
result, err := storageService.Commit(staged, ctx)
|
||||
if err != nil {
|
||||
@@ -976,6 +986,15 @@ func (c *BackendFileController) UploadAvatar() {
|
||||
return
|
||||
}
|
||||
|
||||
// 头像也占用租户附件空间(计入文件台账)
|
||||
if qerr := services.EnsureTenantStorageQuota(tid, uint64(staged.Size)); qerr != nil {
|
||||
if respondStorageQuotaError(&c.Controller, qerr) {
|
||||
return
|
||||
}
|
||||
c.jsonErr(500, 500, "附件空间校验失败: "+qerr.Error())
|
||||
return
|
||||
}
|
||||
|
||||
result, err := storageService.Commit(staged, upCtx)
|
||||
if err != nil {
|
||||
c.jsonErr(500, 500, "上传头像失败: "+err.Error())
|
||||
|
||||
@@ -0,0 +1,303 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"server/models"
|
||||
"server/pkg/identity"
|
||||
"server/pkg/jwtutil"
|
||||
"server/services"
|
||||
"server/services/payment"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// BackendStorageController 租户端附件空间:用量 / 套餐 / 下单 / 购买记录
|
||||
type BackendStorageController struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
func (c *BackendStorageController) claims() (*jwtutil.Claims, error) {
|
||||
return identity.Claims(c.Ctx.Request.Header.Get("Authorization"), identity.EndBackend)
|
||||
}
|
||||
|
||||
func (c *BackendStorageController) fail(httpStatus, bizCode int, msg string) {
|
||||
c.Ctx.Output.SetStatus(httpStatus)
|
||||
c.Data["json"] = map[string]any{"code": bizCode, "msg": msg}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
func (c *BackendStorageController) ok(data any) {
|
||||
c.Data["json"] = map[string]any{"code": 200, "msg": "success", "data": data}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// storageOperator 下单人(账号),用于订单审计
|
||||
func storageOperator(claims *jwtutil.Claims) string {
|
||||
if claims == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(claims.Username)
|
||||
}
|
||||
|
||||
func (c *BackendStorageController) tenantID() (uint64, error) {
|
||||
claims, err := c.claims()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if claims.TenantId <= 0 {
|
||||
return 0, fmt.Errorf("当前账号未归属企业")
|
||||
}
|
||||
return uint64(claims.TenantId), nil
|
||||
}
|
||||
|
||||
// StorageInfo GET /backend/tenant/storageInfo
|
||||
// 附件空间使用情况:基础额度、生效套餐、已用/剩余、到期时间。
|
||||
func (c *BackendStorageController) StorageInfo() {
|
||||
tid, err := c.tenantID()
|
||||
if err != nil {
|
||||
c.fail(401, 401, err.Error())
|
||||
return
|
||||
}
|
||||
info, err := services.GetTenantStorageInfo(tid)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "获取空间信息失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
c.ok(info)
|
||||
}
|
||||
|
||||
// Packages GET /backend/tenant/storagePackages
|
||||
// 可购买的附件空间套餐(上架中)。
|
||||
func (c *BackendStorageController) Packages() {
|
||||
if _, err := c.tenantID(); err != nil {
|
||||
c.fail(401, 401, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
var rows []models.SystemTenantStoragePackage
|
||||
_, err := models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("status", 1).
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("sort", "id").
|
||||
All(&rows)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "获取套餐失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
list := make([]map[string]any, 0, len(rows))
|
||||
for i := range rows {
|
||||
list = append(list, map[string]any{
|
||||
"id": rows[i].ID,
|
||||
"name": rows[i].Name,
|
||||
"code": rows[i].Code,
|
||||
"capacity_mb": rows[i].CapacityMB,
|
||||
"price": rows[i].Price,
|
||||
"duration_days": rows[i].DurationDays,
|
||||
"remark": rows[i].Remark,
|
||||
})
|
||||
}
|
||||
c.ok(map[string]any{"list": list})
|
||||
}
|
||||
|
||||
type storageOrderPayload struct {
|
||||
PackageID uint64 `json:"package_id"`
|
||||
Channel string `json:"channel"`
|
||||
PayType string `json:"pay_type"`
|
||||
ReturnURL string `json:"return_url"`
|
||||
}
|
||||
|
||||
// CreateOrder POST /backend/tenant/storage/order
|
||||
// 创建附件空间订单并拉起支付;返回支付参数供前端调起渠道。
|
||||
func (c *BackendStorageController) CreateOrder() {
|
||||
tid, err := c.tenantID()
|
||||
if err != nil {
|
||||
c.fail(401, 401, err.Error())
|
||||
return
|
||||
}
|
||||
claims, _ := c.claims()
|
||||
|
||||
var p storageOrderPayload
|
||||
if err := c.BindJSON(&p); err != nil {
|
||||
c.fail(400, 400, "参数错误")
|
||||
return
|
||||
}
|
||||
if p.PackageID == 0 {
|
||||
c.fail(400, 400, "请选择要购买的套餐")
|
||||
return
|
||||
}
|
||||
|
||||
var pkg models.SystemTenantStoragePackage
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("id", p.PackageID).
|
||||
Filter("status", 1).
|
||||
Filter("delete_time__isnull", true).
|
||||
One(&pkg); err != nil {
|
||||
c.fail(404, 404, "套餐不存在或已下架")
|
||||
return
|
||||
}
|
||||
if pkg.CapacityMB <= 0 {
|
||||
c.fail(400, 400, "套餐容量配置异常")
|
||||
return
|
||||
}
|
||||
|
||||
// 租户名称(支付单展示)
|
||||
tenantName := ""
|
||||
var tenant models.SystemTenant
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", tid).One(&tenant); err == nil {
|
||||
tenantName = tenant.TenantName
|
||||
}
|
||||
|
||||
orderNo := services.BuildStorageOrderNo(tid)
|
||||
order := &models.SystemTenantStorageOrder{
|
||||
OrderNo: orderNo,
|
||||
Tid: tid,
|
||||
PackageID: pkg.ID,
|
||||
PackageName: pkg.Name,
|
||||
CapacityMB: pkg.CapacityMB,
|
||||
DurationDays: pkg.DurationDays,
|
||||
Amount: pkg.Price,
|
||||
Status: models.StorageOrderPending,
|
||||
Operator: storageOperator(claims),
|
||||
}
|
||||
if _, err := models.Orm.Insert(order); err != nil {
|
||||
c.fail(500, 500, "创建订单失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
// 免费套餐:直接激活,不拉起支付
|
||||
if pkg.Price <= 0 {
|
||||
if err := services.ActivateStorageOrder(orderNo, ""); err != nil {
|
||||
c.fail(500, 500, "开通失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
c.ok(map[string]any{"order_no": orderNo, "free": true, "amount": 0})
|
||||
return
|
||||
}
|
||||
|
||||
channel := strings.TrimSpace(p.Channel)
|
||||
if channel == "" {
|
||||
c.fail(400, 400, "请选择支付渠道")
|
||||
return
|
||||
}
|
||||
amountFen := int64(math.Round(pkg.Price * 100))
|
||||
payOrder, params, err := payment.CreatePayment(
|
||||
c.Ctx.Request.Context(),
|
||||
payment.CreateInput{
|
||||
OutTradeNo: orderNo,
|
||||
OrderType: "tenant_storage",
|
||||
TenantID: strconv.FormatUint(tid, 10),
|
||||
TenantName: tenantName,
|
||||
Amount: amountFen,
|
||||
Channel: channel,
|
||||
Subject: "附件空间-" + pkg.Name,
|
||||
ClientIP: c.Ctx.Input.IP(),
|
||||
PayType: strings.TrimSpace(p.PayType),
|
||||
ReturnURL: strings.TrimSpace(p.ReturnURL),
|
||||
},
|
||||
)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "发起支付失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
c.ok(map[string]any{
|
||||
"order_no": orderNo,
|
||||
"pay_no": payOrder.PayNo,
|
||||
"amount": pkg.Price,
|
||||
"pay_params": params,
|
||||
})
|
||||
}
|
||||
|
||||
// Orders GET /backend/tenant/storage/orders?page=&pageSize=
|
||||
func (c *BackendStorageController) Orders() {
|
||||
tid, err := c.tenantID()
|
||||
if err != nil {
|
||||
c.fail(401, 401, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
page, _ := strconv.Atoi(c.GetString("page", "1"))
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
pageSize, _ := strconv.Atoi(c.GetString("pageSize", "10"))
|
||||
if pageSize <= 0 || pageSize > 100 {
|
||||
pageSize = 10
|
||||
}
|
||||
|
||||
qs := models.Orm.QueryTable(new(models.SystemTenantStorageOrder)).
|
||||
Filter("tid", tid).
|
||||
Filter("delete_time__isnull", true)
|
||||
total, err := qs.Count()
|
||||
if err != nil {
|
||||
c.fail(500, 500, "查询失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
var rows []models.SystemTenantStorageOrder
|
||||
_, err = qs.OrderBy("-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&rows)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "查询失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
list := make([]map[string]any, 0, len(rows))
|
||||
for i := range rows {
|
||||
r := &rows[i]
|
||||
list = append(list, map[string]any{
|
||||
"order_no": r.OrderNo,
|
||||
"package_id": r.PackageID,
|
||||
"package_name": r.PackageName,
|
||||
"capacity_mb": r.CapacityMB,
|
||||
"duration_days": r.DurationDays,
|
||||
"amount": r.Amount,
|
||||
"status": r.Status,
|
||||
"pay_no": r.PayNo,
|
||||
"start_time": r.StartTime,
|
||||
"end_time": r.EndTime,
|
||||
"create_time": r.CreateTime,
|
||||
})
|
||||
}
|
||||
c.ok(map[string]any{"list": list, "total": total, "page": page, "pageSize": pageSize})
|
||||
}
|
||||
|
||||
// OrderDetail GET /backend/tenant/storage/order/:orderNo
|
||||
// 支付后轮询用:返回订单状态与最新空间信息。
|
||||
func (c *BackendStorageController) OrderDetail() {
|
||||
tid, err := c.tenantID()
|
||||
if err != nil {
|
||||
c.fail(401, 401, err.Error())
|
||||
return
|
||||
}
|
||||
orderNo := strings.TrimSpace(c.Ctx.Input.Param(":orderNo"))
|
||||
if orderNo == "" {
|
||||
c.fail(400, 400, "订单号不能为空")
|
||||
return
|
||||
}
|
||||
|
||||
var order models.SystemTenantStorageOrder
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenantStorageOrder)).
|
||||
Filter("order_no", orderNo).
|
||||
Filter("tid", tid).
|
||||
Filter("delete_time__isnull", true).
|
||||
One(&order); err != nil {
|
||||
c.fail(404, 404, "订单不存在")
|
||||
return
|
||||
}
|
||||
|
||||
info, _ := services.GetTenantStorageInfo(tid)
|
||||
c.ok(map[string]any{
|
||||
"order_no": order.OrderNo,
|
||||
"status": order.Status,
|
||||
"pay_no": order.PayNo,
|
||||
"capacity_mb": order.CapacityMB,
|
||||
"amount": order.Amount,
|
||||
"start_time": order.StartTime,
|
||||
"end_time": order.EndTime,
|
||||
"storage_info": info,
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"server/models"
|
||||
"server/services"
|
||||
"server/services/payment"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
)
|
||||
|
||||
// 支付成功 -> 附件空间订单同步:
|
||||
// 渠道回调(或主动查询)把支付单置为 paid 时,支付服务会调用这里注册的钩子,
|
||||
// 自动把附件空间订单置为已支付并计算生效区间(续费顺延 / 换规格替换)。
|
||||
func init() {
|
||||
payment.RegisterOrderSyncHook(syncStorageOrderFromPayment)
|
||||
}
|
||||
|
||||
func syncStorageOrderFromPayment(_ context.Context, payOrder *models.PlatformPaymentOrder) error {
|
||||
if payOrder == nil {
|
||||
return nil
|
||||
}
|
||||
orderNo := strings.TrimSpace(payOrder.OutTradeNo)
|
||||
if orderNo == "" || !strings.HasPrefix(orderNo, "ST") {
|
||||
// 不是附件空间订单,交给其他钩子处理
|
||||
return nil
|
||||
}
|
||||
|
||||
var order models.SystemTenantStorageOrder
|
||||
err := models.Orm.QueryTable(new(models.SystemTenantStorageOrder)).
|
||||
Filter("order_no", orderNo).
|
||||
Filter("delete_time__isnull", true).
|
||||
One(&order)
|
||||
if err == orm.ErrNoRows {
|
||||
// 下单链路先建支付单、后落业务订单,回调可能抢先到达:
|
||||
// 10 分钟内保留重试,超过窗口视为非本模块订单。
|
||||
if time.Since(payOrder.CreateTime) < 10*time.Minute {
|
||||
return fmt.Errorf("附件空间订单 %s 尚未入库,等待重试", orderNo)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if order.Status == models.StorageOrderPaid {
|
||||
return nil
|
||||
}
|
||||
return services.ActivateStorageOrder(orderNo, payOrder.PayNo)
|
||||
}
|
||||
@@ -0,0 +1,212 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"math"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"server/models"
|
||||
"server/pkg/identity"
|
||||
|
||||
"github.com/beego/beego/v2/client/orm"
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// PlatformAnalyticsController 平台端数据统计(真实数据,不做任何模拟)
|
||||
type PlatformAnalyticsController struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
func (c *PlatformAnalyticsController) analyticsFail(httpStatus, bizCode int, msg string) {
|
||||
c.Ctx.Output.SetStatus(httpStatus)
|
||||
c.Data["json"] = map[string]any{"code": bizCode, "msg": msg}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// Users GET /platform/analytics/users
|
||||
//
|
||||
// 统计租户端(backend)真实的用户与租户数据:
|
||||
// - 用户:yz_system_tenant_user(不含已删除)
|
||||
// - 租户:yz_system_tenant(不含已删除)
|
||||
// - 活跃:yz_system_login_log 近 30 天成功登录的去重用户 / 今日登录次数
|
||||
//
|
||||
// 返回:总量、今日/本月新增、近 14 天新增趋势、各租户用户数分布。
|
||||
func (c *PlatformAnalyticsController) Users() {
|
||||
if _, err := requirePlatform(&c.Controller); err != nil {
|
||||
code := identity.Status(err)
|
||||
c.analyticsFail(code, code, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
|
||||
monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
|
||||
lastMonthStart := monthStart.AddDate(0, -1, 0)
|
||||
trendStart := today.AddDate(0, 0, -13) // 含今天共 14 天
|
||||
activeSince := now.AddDate(0, 0, -30)
|
||||
|
||||
userQuery := func() orm.QuerySeter {
|
||||
return models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("delete_time__isnull", true)
|
||||
}
|
||||
tenantQuery := func() orm.QuerySeter {
|
||||
return models.Orm.QueryTable(new(models.SystemTenant)).
|
||||
Filter("delete_time__isnull", true)
|
||||
}
|
||||
|
||||
// ===== 用户 =====
|
||||
totalUsers, _ := userQuery().Count()
|
||||
activeUsers, _ := userQuery().Filter("status", 1).Count()
|
||||
todayNewUsers, _ := userQuery().Filter("create_time__gte", today).Count()
|
||||
monthNewUsers, _ := userQuery().Filter("create_time__gte", monthStart).Count()
|
||||
lastMonthNewUsers, _ := userQuery().
|
||||
Filter("create_time__gte", lastMonthStart).
|
||||
Filter("create_time__lt", monthStart).
|
||||
Count()
|
||||
|
||||
// ===== 租户 =====
|
||||
totalTenants, _ := tenantQuery().Count()
|
||||
activeTenants, _ := tenantQuery().Filter("status", 1).Count()
|
||||
todayNewTenants, _ := tenantQuery().Filter("create_time__gte", today).Count()
|
||||
monthNewTenants, _ := tenantQuery().Filter("create_time__gte", monthStart).Count()
|
||||
|
||||
// ===== 活跃用户(近 30 天成功登录)=====
|
||||
var loginLogs []models.SystemLoginLog
|
||||
_, _ = models.Orm.QueryTable(new(models.SystemLoginLog)).
|
||||
Filter("create_time__gte", activeSince).
|
||||
Filter("status", 1).
|
||||
All(&loginLogs)
|
||||
|
||||
activeUserSet := make(map[uint64]struct{}, len(loginLogs))
|
||||
todayLogins := 0
|
||||
for _, log := range loginLogs {
|
||||
if log.UserID > 0 {
|
||||
activeUserSet[log.UserID] = struct{}{}
|
||||
}
|
||||
if !log.CreateTime.Before(today) {
|
||||
todayLogins++
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 近 14 天新增趋势 =====
|
||||
const trendDays = 14
|
||||
days := make([]string, trendDays)
|
||||
dayUsers := make([]int, trendDays)
|
||||
dayTenants := make([]int, trendDays)
|
||||
dayIndex := make(map[string]int, trendDays)
|
||||
for i := 0; i < trendDays; i++ {
|
||||
d := trendStart.AddDate(0, 0, i)
|
||||
key := d.Format("2006-01-02")
|
||||
dayIndex[key] = i
|
||||
days[i] = d.Format("01-02")
|
||||
}
|
||||
|
||||
var recentUsers []models.SystemTenantUser
|
||||
_, _ = userQuery().Filter("create_time__gte", trendStart).All(&recentUsers)
|
||||
for _, u := range recentUsers {
|
||||
if i, ok := dayIndex[u.CreateTime.Format("2006-01-02")]; ok {
|
||||
dayUsers[i]++
|
||||
}
|
||||
}
|
||||
|
||||
var recentTenants []models.SystemTenant
|
||||
_, _ = tenantQuery().Filter("create_time__gte", trendStart).All(&recentTenants)
|
||||
for _, t := range recentTenants {
|
||||
if i, ok := dayIndex[t.CreateTime.Format("2006-01-02")]; ok {
|
||||
dayTenants[i]++
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 各租户用户数分布(Top 8 + 其他)=====
|
||||
var allUsers []models.SystemTenantUser
|
||||
_, _ = userQuery().All(&allUsers)
|
||||
countByTid := make(map[uint64]int, len(allUsers))
|
||||
for _, u := range allUsers {
|
||||
countByTid[u.Tid]++
|
||||
}
|
||||
|
||||
var allTenants []models.SystemTenant
|
||||
_, _ = tenantQuery().All(&allTenants)
|
||||
tenantName := make(map[uint64]string, len(allTenants))
|
||||
for _, t := range allTenants {
|
||||
tenantName[t.ID] = t.TenantName
|
||||
}
|
||||
|
||||
type tenantUserCount struct {
|
||||
ID uint64
|
||||
Name string
|
||||
Value int
|
||||
}
|
||||
dist := make([]tenantUserCount, 0, len(countByTid))
|
||||
for tid, count := range countByTid {
|
||||
name := tenantName[tid]
|
||||
if name == "" {
|
||||
name = "未归属租户"
|
||||
}
|
||||
dist = append(dist, tenantUserCount{ID: tid, Name: name, Value: count})
|
||||
}
|
||||
sort.Slice(dist, func(i, j int) bool {
|
||||
if dist[i].Value != dist[j].Value {
|
||||
return dist[i].Value > dist[j].Value
|
||||
}
|
||||
return dist[i].ID < dist[j].ID
|
||||
})
|
||||
|
||||
const topN = 8
|
||||
tenantUserTop := make([]map[string]any, 0, topN+1)
|
||||
otherCount := 0
|
||||
for i, item := range dist {
|
||||
if i < topN {
|
||||
tenantUserTop = append(tenantUserTop, map[string]any{
|
||||
"name": item.Name,
|
||||
"value": item.Value,
|
||||
})
|
||||
} else {
|
||||
otherCount += item.Value
|
||||
}
|
||||
}
|
||||
if otherCount > 0 {
|
||||
tenantUserTop = append(tenantUserTop, map[string]any{
|
||||
"name": "其他",
|
||||
"value": otherCount,
|
||||
})
|
||||
}
|
||||
|
||||
// ===== 环比(本月新增 vs 上月新增)=====
|
||||
growthPct := 0.0
|
||||
growthUp := true
|
||||
if lastMonthNewUsers > 0 {
|
||||
growthPct = float64(monthNewUsers-lastMonthNewUsers) / float64(lastMonthNewUsers) * 100
|
||||
growthUp = monthNewUsers >= lastMonthNewUsers
|
||||
} else if monthNewUsers > 0 {
|
||||
growthPct = 100
|
||||
}
|
||||
growthPct = math.Round(math.Abs(growthPct)*10) / 10
|
||||
|
||||
c.Data["json"] = map[string]any{
|
||||
"code": 200,
|
||||
"msg": "success",
|
||||
"data": map[string]any{
|
||||
"totalUsers": totalUsers,
|
||||
"activeUsers": activeUsers,
|
||||
"todayNewUsers": todayNewUsers,
|
||||
"monthNewUsers": monthNewUsers,
|
||||
"lastMonthNewUsers": lastMonthNewUsers,
|
||||
"totalTenants": totalTenants,
|
||||
"activeTenants": activeTenants,
|
||||
"todayNewTenants": todayNewTenants,
|
||||
"monthNewTenants": monthNewTenants,
|
||||
"activeUsers30d": len(activeUserSet),
|
||||
"todayLogins": todayLogins,
|
||||
"userGrowthPct": growthPct,
|
||||
"userGrowthUp": growthUp,
|
||||
"tenantUserTop": tenantUserTop,
|
||||
"trend": map[string]any{
|
||||
"days": days,
|
||||
"users": dayUsers,
|
||||
"tenants": dayTenants,
|
||||
},
|
||||
},
|
||||
}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
@@ -0,0 +1,354 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"server/models"
|
||||
"server/pkg/identity"
|
||||
"server/services"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// PlatformStorageController 平台端附件空间管理:
|
||||
// 套餐维护、租户空间用量与基础额度调整、订单查询。
|
||||
type PlatformStorageController struct {
|
||||
beego.Controller
|
||||
}
|
||||
|
||||
func (c *PlatformStorageController) fail(httpStatus, bizCode int, msg string) {
|
||||
c.Ctx.Output.SetStatus(httpStatus)
|
||||
c.Data["json"] = map[string]any{"code": bizCode, "msg": msg}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
func (c *PlatformStorageController) ok(data any) {
|
||||
c.Data["json"] = map[string]any{"code": 200, "msg": "success", "data": data}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
func (c *PlatformStorageController) auth() bool {
|
||||
if _, err := requirePlatform(&c.Controller); err != nil {
|
||||
code := identity.Status(err)
|
||||
c.fail(code, code, err.Error())
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
type storagePackagePayload struct {
|
||||
Name string `json:"name"`
|
||||
Code string `json:"code"`
|
||||
CapacityMB int `json:"capacity_mb"`
|
||||
Price *float64 `json:"price"`
|
||||
DurationDays int `json:"duration_days"`
|
||||
Sort int `json:"sort"`
|
||||
Status *int8 `json:"status"`
|
||||
Remark string `json:"remark"`
|
||||
}
|
||||
|
||||
// Packages GET /platform/storage/packages 套餐列表(含下架)
|
||||
func (c *PlatformStorageController) Packages() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
var rows []models.SystemTenantStoragePackage
|
||||
_, err := models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("sort", "id").
|
||||
All(&rows)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "查询失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
list := make([]map[string]any, 0, len(rows))
|
||||
for i := range rows {
|
||||
r := &rows[i]
|
||||
list = append(list, map[string]any{
|
||||
"id": r.ID,
|
||||
"name": r.Name,
|
||||
"code": r.Code,
|
||||
"capacity_mb": r.CapacityMB,
|
||||
"price": r.Price,
|
||||
"duration_days": r.DurationDays,
|
||||
"sort": r.Sort,
|
||||
"status": r.Status,
|
||||
"remark": r.Remark,
|
||||
"create_time": r.CreateTime,
|
||||
})
|
||||
}
|
||||
c.ok(map[string]any{"list": list})
|
||||
}
|
||||
|
||||
// CreatePackage POST /platform/storage/package/create
|
||||
func (c *PlatformStorageController) CreatePackage() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
var p storagePackagePayload
|
||||
if err := c.BindJSON(&p); err != nil {
|
||||
c.fail(400, 400, "参数错误")
|
||||
return
|
||||
}
|
||||
name := strings.TrimSpace(p.Name)
|
||||
if name == "" {
|
||||
c.fail(400, 400, "请填写套餐名称")
|
||||
return
|
||||
}
|
||||
if p.CapacityMB <= 0 {
|
||||
c.fail(400, 400, "容量必须大于 0")
|
||||
return
|
||||
}
|
||||
status := int8(1)
|
||||
if p.Status != nil {
|
||||
status = *p.Status
|
||||
}
|
||||
duration := p.DurationDays
|
||||
if duration <= 0 {
|
||||
duration = 365
|
||||
}
|
||||
price := 0.0
|
||||
if p.Price != nil && *p.Price > 0 {
|
||||
price = *p.Price
|
||||
}
|
||||
|
||||
row := &models.SystemTenantStoragePackage{
|
||||
Name: name,
|
||||
Code: strings.TrimSpace(p.Code),
|
||||
CapacityMB: p.CapacityMB,
|
||||
Price: price,
|
||||
DurationDays: duration,
|
||||
Sort: p.Sort,
|
||||
Status: status,
|
||||
Remark: strings.TrimSpace(p.Remark),
|
||||
}
|
||||
id, err := models.Orm.Insert(row)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "创建失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
c.ok(map[string]any{"id": id})
|
||||
}
|
||||
|
||||
// UpdatePackage POST /platform/storage/package/:id
|
||||
func (c *PlatformStorageController) UpdatePackage() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
c.fail(400, 400, "无效的套餐ID")
|
||||
return
|
||||
}
|
||||
var p storagePackagePayload
|
||||
if err := c.BindJSON(&p); err != nil {
|
||||
c.fail(400, 400, "参数错误")
|
||||
return
|
||||
}
|
||||
|
||||
update := map[string]any{"update_time": time.Now()}
|
||||
if name := strings.TrimSpace(p.Name); name != "" {
|
||||
update["name"] = name
|
||||
}
|
||||
if p.Code != "" {
|
||||
update["code"] = strings.TrimSpace(p.Code)
|
||||
}
|
||||
if p.CapacityMB > 0 {
|
||||
update["capacity_mb"] = p.CapacityMB
|
||||
}
|
||||
if p.Price != nil {
|
||||
update["price"] = *p.Price
|
||||
}
|
||||
if p.DurationDays > 0 {
|
||||
update["duration_days"] = p.DurationDays
|
||||
}
|
||||
update["sort"] = p.Sort
|
||||
if p.Status != nil {
|
||||
update["status"] = *p.Status
|
||||
}
|
||||
update["remark"] = strings.TrimSpace(p.Remark)
|
||||
|
||||
n, err := models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("id", id).
|
||||
Filter("delete_time__isnull", true).
|
||||
Update(update)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "更新失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
if n == 0 {
|
||||
c.fail(404, 404, "套餐不存在")
|
||||
return
|
||||
}
|
||||
c.ok(nil)
|
||||
}
|
||||
|
||||
// TogglePackage POST /platform/storage/package/:id/status body: {"status":0|1}
|
||||
func (c *PlatformStorageController) TogglePackage() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
c.fail(400, 400, "无效的套餐ID")
|
||||
return
|
||||
}
|
||||
var p struct {
|
||||
Status int8 `json:"status"`
|
||||
}
|
||||
if err := c.BindJSON(&p); err != nil {
|
||||
c.fail(400, 400, "参数错误")
|
||||
return
|
||||
}
|
||||
if p.Status != 0 && p.Status != 1 {
|
||||
c.fail(400, 400, "状态值不合法")
|
||||
return
|
||||
}
|
||||
_, err = models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("id", id).
|
||||
Filter("delete_time__isnull", true).
|
||||
Update(map[string]any{"status": p.Status, "update_time": time.Now()})
|
||||
if err != nil {
|
||||
c.fail(500, 500, "更新失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
c.ok(nil)
|
||||
}
|
||||
|
||||
// DeletePackage DELETE /platform/storage/package/:id
|
||||
func (c *PlatformStorageController) DeletePackage() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
c.fail(400, 400, "无效的套餐ID")
|
||||
return
|
||||
}
|
||||
n, err := models.Orm.QueryTable(new(models.SystemTenantStoragePackage)).
|
||||
Filter("id", id).
|
||||
Filter("delete_time__isnull", true).
|
||||
Update(map[string]any{"delete_time": time.Now(), "update_time": time.Now()})
|
||||
if err != nil {
|
||||
c.fail(500, 500, "删除失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
if n == 0 {
|
||||
c.fail(404, 404, "套餐不存在")
|
||||
return
|
||||
}
|
||||
c.ok(nil)
|
||||
}
|
||||
|
||||
// TenantInfo GET /platform/storage/tenant/:tid 租户空间用量
|
||||
func (c *PlatformStorageController) TenantInfo() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
tid, err := strconv.ParseUint(c.Ctx.Input.Param(":tid"), 10, 64)
|
||||
if err != nil || tid == 0 {
|
||||
c.fail(400, 400, "无效的租户ID")
|
||||
return
|
||||
}
|
||||
info, err := services.GetTenantStorageInfo(tid)
|
||||
if err != nil {
|
||||
c.fail(500, 500, "获取失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
c.ok(info)
|
||||
}
|
||||
|
||||
// UpdateTenantQuota POST /platform/storage/tenant/:tid/quota body: {"storage_quota_mb": 500}
|
||||
// 平台直接调整租户基础额度(赠送 / 降级),不影响已购买的套餐。
|
||||
func (c *PlatformStorageController) UpdateTenantQuota() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
tid, err := strconv.ParseUint(c.Ctx.Input.Param(":tid"), 10, 64)
|
||||
if err != nil || tid == 0 {
|
||||
c.fail(400, 400, "无效的租户ID")
|
||||
return
|
||||
}
|
||||
var p struct {
|
||||
StorageQuotaMB int `json:"storage_quota_mb"`
|
||||
}
|
||||
if err := c.BindJSON(&p); err != nil {
|
||||
c.fail(400, 400, "参数错误")
|
||||
return
|
||||
}
|
||||
if p.StorageQuotaMB < 0 {
|
||||
c.fail(400, 400, "额度不能为负数")
|
||||
return
|
||||
}
|
||||
if p.StorageQuotaMB == 0 {
|
||||
p.StorageQuotaMB = services.DefaultTenantStorageMB
|
||||
}
|
||||
|
||||
_, err = models.Orm.QueryTable(new(models.SystemTenant)).
|
||||
Filter("id", tid).
|
||||
Update(map[string]any{"storage_quota_mb": p.StorageQuotaMB})
|
||||
if err != nil {
|
||||
c.fail(500, 500, "更新失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
info, _ := services.GetTenantStorageInfo(tid)
|
||||
c.ok(info)
|
||||
}
|
||||
|
||||
// Orders GET /platform/storage/orders?tid=&status=&page=&pageSize=
|
||||
func (c *PlatformStorageController) Orders() {
|
||||
if !c.auth() {
|
||||
return
|
||||
}
|
||||
page, _ := strconv.Atoi(c.GetString("page", "1"))
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
pageSize, _ := strconv.Atoi(c.GetString("pageSize", "10"))
|
||||
if pageSize <= 0 || pageSize > 100 {
|
||||
pageSize = 10
|
||||
}
|
||||
|
||||
qs := models.Orm.QueryTable(new(models.SystemTenantStorageOrder)).
|
||||
Filter("delete_time__isnull", true)
|
||||
if tid, err := strconv.ParseUint(strings.TrimSpace(c.GetString("tid")), 10, 64); err == nil && tid > 0 {
|
||||
qs = qs.Filter("tid", tid)
|
||||
}
|
||||
if st := strings.TrimSpace(c.GetString("status")); st != "" {
|
||||
qs = qs.Filter("status", st)
|
||||
}
|
||||
|
||||
total, err := qs.Count()
|
||||
if err != nil {
|
||||
c.fail(500, 500, "查询失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
var rows []models.SystemTenantStorageOrder
|
||||
if _, err := qs.OrderBy("-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&rows); err != nil {
|
||||
c.fail(500, 500, "查询失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
list := make([]map[string]any, 0, len(rows))
|
||||
for i := range rows {
|
||||
r := &rows[i]
|
||||
list = append(list, map[string]any{
|
||||
"order_no": r.OrderNo,
|
||||
"tid": r.Tid,
|
||||
"package_id": r.PackageID,
|
||||
"package_name": r.PackageName,
|
||||
"capacity_mb": r.CapacityMB,
|
||||
"duration_days": r.DurationDays,
|
||||
"amount": r.Amount,
|
||||
"status": r.Status,
|
||||
"pay_no": r.PayNo,
|
||||
"start_time": r.StartTime,
|
||||
"end_time": r.EndTime,
|
||||
"operator": r.Operator,
|
||||
"create_time": r.CreateTime,
|
||||
})
|
||||
}
|
||||
c.ok(map[string]any{"list": list, "total": total, "page": page, "pageSize": pageSize})
|
||||
}
|
||||
@@ -40,7 +40,9 @@ type tenantDTO struct {
|
||||
DaysRemaining int `json:"days_remaining"`
|
||||
UserQuota int `json:"user_quota"`
|
||||
UserUsed int `json:"user_used"`
|
||||
Remark string `json:"remark"`
|
||||
// StorageQuotaMB 附件空间基础额度(MB)
|
||||
StorageQuotaMB int `json:"storage_quota_mb"`
|
||||
Remark string `json:"remark"`
|
||||
CreateTime *time.Time `json:"create_time,omitempty"`
|
||||
UpdateTime *time.Time `json:"update_time,omitempty"`
|
||||
DeleteTime *time.Time `json:"delete_time,omitempty"`
|
||||
@@ -109,6 +111,7 @@ func toTenantDTO(t models.SystemTenant) tenantDTO {
|
||||
PackageExpireTime: t.PackageExpireTime,
|
||||
DaysRemaining: daysRemaining,
|
||||
UserQuota: t.UserQuota,
|
||||
StorageQuotaMB: t.StorageQuotaMB,
|
||||
Remark: stringValue(t.Remark),
|
||||
CreateTime: &ct,
|
||||
UpdateTime: &ut,
|
||||
@@ -235,7 +238,9 @@ type tenantPayload struct {
|
||||
// 套餐与用户数上限(可选)
|
||||
PackageID *uint64 `json:"package_id"`
|
||||
UserQuota *int `json:"user_quota"`
|
||||
Remark string `json:"remark"`
|
||||
// StorageQuotaMB 附件空间基础额度(MB,可选)
|
||||
StorageQuotaMB *int `json:"storage_quota_mb"`
|
||||
Remark string `json:"remark"`
|
||||
|
||||
// 指定租户管理员(可选):把已有认证身份绑定为该租户管理员。
|
||||
// AdminIdentityID 直接指定身份;也可只传 AdminAccount/AdminPhone/AdminEmail 按归并键定位。
|
||||
@@ -274,6 +279,11 @@ func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
|
||||
p.UserQuota = &v
|
||||
}
|
||||
}
|
||||
if s := strings.TrimSpace(c.GetString("storage_quota_mb")); s != "" {
|
||||
if v, err := strconv.Atoi(s); err == nil {
|
||||
p.StorageQuotaMB = &v
|
||||
}
|
||||
}
|
||||
if s := strings.TrimSpace(c.GetString("admin_identity_id")); s != "" {
|
||||
if v, err := strconv.ParseUint(s, 10, 64); err == nil {
|
||||
p.AdminIdentityID = v
|
||||
@@ -430,6 +440,11 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
if userQuota <= 0 {
|
||||
userQuota = services.DefaultTenantUserQuota
|
||||
}
|
||||
// 附件空间基础额度:未显式指定时按 500MB
|
||||
storageQuota := services.DefaultTenantStorageMB
|
||||
if p.StorageQuotaMB != nil && *p.StorageQuotaMB > 0 {
|
||||
storageQuota = *p.StorageQuotaMB
|
||||
}
|
||||
|
||||
t := models.SystemTenant{
|
||||
TenantCode: p.TenantCode,
|
||||
@@ -443,6 +458,7 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
PackageID: packageID,
|
||||
PackageExpireTime: packageExpire,
|
||||
UserQuota: userQuota,
|
||||
StorageQuotaMB: storageQuota,
|
||||
Remark: stringPtr(p.Remark),
|
||||
}
|
||||
|
||||
@@ -536,6 +552,14 @@ func (c *PlatformTenantController) EditTenant() {
|
||||
update["user_quota"] = quota
|
||||
}
|
||||
}
|
||||
if p.StorageQuotaMB != nil {
|
||||
// 附件空间基础额度:允许平台赠送/降级;0 视为恢复默认 500MB
|
||||
storageQuota := *p.StorageQuotaMB
|
||||
if storageQuota <= 0 {
|
||||
storageQuota = services.DefaultTenantStorageMB
|
||||
}
|
||||
update["storage_quota_mb"] = storageQuota
|
||||
}
|
||||
|
||||
_, err = models.Orm.QueryTable(new(models.SystemTenant)).Filter("id", id).Update(update)
|
||||
if err != nil {
|
||||
|
||||
@@ -12,6 +12,7 @@ import (
|
||||
"time"
|
||||
|
||||
"server/models"
|
||||
"server/pkg/identity"
|
||||
"server/pkg/passwordutil"
|
||||
"server/services"
|
||||
authsvc "server/services/auth"
|
||||
@@ -95,6 +96,45 @@ type tenantUserPayload struct {
|
||||
Remark *string `json:"remark"`
|
||||
}
|
||||
|
||||
// GetTenantOrganizations GET /platform/tenantUser/orgs?tid=1
|
||||
// 平台端代租户加用户时,部门下拉必须取「该租户」的组织架构;
|
||||
// 平台自己的组织与租户无关,直接查会一直是空列表。
|
||||
func (c *PlatformTenantUserController) GetTenantOrganizations() {
|
||||
if _, err := requirePlatform(&c.Controller); err != nil {
|
||||
code := identity.Status(err)
|
||||
c.Data["json"] = map[string]interface{}{"code": code, "msg": err.Error()}
|
||||
_ = c.ServeJSON()
|
||||
return
|
||||
}
|
||||
|
||||
tid, _ := c.GetUint64("tid")
|
||||
list := make([]map[string]interface{}, 0)
|
||||
if tid > 0 {
|
||||
var rows []models.BackendOrganization
|
||||
_, _ = models.Orm.QueryTable(new(models.BackendOrganization)).
|
||||
Filter("tid", tid).
|
||||
Filter("delete_time__isnull", true).
|
||||
OrderBy("sort", "id").
|
||||
All(&rows)
|
||||
for i := range rows {
|
||||
list = append(list, map[string]interface{}{
|
||||
"id": rows[i].ID,
|
||||
"org_name": rows[i].OrgName,
|
||||
"parent_id": rows[i].ParentID,
|
||||
"sort": rows[i].Sort,
|
||||
"status": rows[i].Status,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": 200,
|
||||
"msg": "success",
|
||||
"data": map[string]interface{}{"list": list},
|
||||
}
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// GetTenantUserList 获取绑定列表(支持按 tid / uid 过滤,keyword 对姓名/手机/邮箱/账号模糊匹配)
|
||||
// GET /platform/tenantUser/list?tid=1&uid=2&keyword=xxx
|
||||
func (c *PlatformTenantUserController) GetTenantUserList() {
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"server/services"
|
||||
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// StorageQuotaExceededBizCode 附件空间不足的业务码。
|
||||
// 前端据此弹「空间不足,去扩容」,而不是普通错误提示。
|
||||
const StorageQuotaExceededBizCode = 4032
|
||||
|
||||
// respondStorageQuotaError 输出「附件空间不足」响应。
|
||||
// 返回 true 表示已写入响应,调用方必须立即 return。
|
||||
func respondStorageQuotaError(c *beego.Controller, err error) bool {
|
||||
quotaErr, ok := err.(*services.StorageQuotaExceededError)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
c.Ctx.Output.SetStatus(403)
|
||||
c.Data["json"] = map[string]interface{}{
|
||||
"code": StorageQuotaExceededBizCode,
|
||||
"msg": quotaErr.Error(),
|
||||
"data": map[string]interface{}{
|
||||
"used_bytes": quotaErr.UsedBytes,
|
||||
"quota_bytes": quotaErr.QuotaBytes,
|
||||
"required_bytes": quotaErr.RequiredBytes,
|
||||
},
|
||||
}
|
||||
_ = c.ServeJSON()
|
||||
return true
|
||||
}
|
||||
Reference in new issue
Block a user