williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目管理，增加网站活动管理

Browse Source
This commit is contained in:
henry
2021-12-15 17:36:56 +08:00
parent ba62a25e4b
commit a59759379c
13 changed files with 281 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/api/enterprise/api/activity.go
View File

@ -25,13 +25,14 @@ func (*Activity) Applys(c *gin.Context) {
func (*Activity) ApplyLaunch(c *gin.Context) {
form := &struct {
Mode int `json:"mode" form:"mode" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
Content string `json:"content" form:"content"`
MaxNumber int `json:"max_number" form:"max_number"`
BeginAt string `json:"begin_at" form:"begin_at" binding:"required"`
FinishAt string `json:"finish_at" form:"finish_at" binding:"required"`
JoinDeadline string `json:"join_deadline" form:"join_deadline" binding:"required"`
Mode int `json:"mode" form:"mode" binding:"required"`
Title string `json:"title" form:"title" binding:"required"`
Amount float64 `json:"amount" form:"amount"`
Content string `json:"content" form:"content"`
MaxNumber int `json:"max_number" form:"max_number"`
BeginAt string `json:"begin_at" form:"begin_at" binding:"required"`
FinishAt string `json:"finish_at" form:"finish_at" binding:"required"`
JoinDeadline string `json:"join_deadline" form:"join_deadline" binding:"required"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
@ -40,7 +41,7 @@ func (*Activity) ApplyLaunch(c *gin.Context) {
}
err := activity.NewApply()(api.GetSession()(c).(*session.Enterprise), api.GetLocal()(c).(string)).
Launch(&activity.ApplyLaunchParams{
Mode: form.Mode, MaxNUmber: form.MaxNumber, Title: form.Title, Content: form.Content,
Mode: form.Mode, MaxNUmber: form.MaxNumber, Title: form.Title, Amount: form.Amount, Content: form.Content,
BeginAt: form.BeginAt, FinishAt: form.FinishAt, JoinDeadline: form.JoinDeadline,
})
api.APIResponse(err)(c)

2
app/api/enterprise/controller/activity/apply.go
View File

@ -23,6 +23,7 @@ type (
Mode, MaxNUmber int
Title, Content string
BeginAt, FinishAt, JoinDeadline string
Amount float64
}
)
@ -66,6 +67,7 @@ func (c *Apply) Launch(params *ApplyLaunchParams) error {
mActivityApply.IdentityUID = c.IdentityUID
mActivityApply.Mode = model2.ActivityInstanceMode(params.Mode)
mActivityApply.Title = params.Title
mActivityApply.Amount = params.Amount
mActivityApply.Content = params.Content
mActivityApply.MaxNumber = params.MaxNUmber
mActivityApply.BeginAt = utils.DateTimeToTime(params.BeginAt)

47
app/api/website/api/activity.go Normal file
View File

@ -0,0 +1,47 @@
package api
import (
"SciencesServer/app/api/website/controller"
"SciencesServer/app/basic/api"
"github.com/gin-gonic/gin"
)
type Activity struct{}
func (*Activity) Instance(c *gin.Context) {
form := &struct {
Title string `json:"title" form:"title"`
Mode int `json:"mode" form:"mode"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := controller.NewActivity()(nil, "").Instance(form.Title, form.Mode, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Activity) Detail(c *gin.Context) {
form := &struct {
api.IDStringForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := controller.NewActivity()(nil, "").Detail(form.Convert())
api.APIResponse(err, data)(c)
}
func (*Activity) Join(c *gin.Context) {
form := &struct {
api.IDStringForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
err := controller.NewActivity()(nil, "").Join(form.Convert())
api.APIResponse(err)(c)
}

1
app/api/website/api/config.go Normal file
View File

@ -0,0 +1 @@
package api

113
app/api/website/controller/activity.go
View File

@ -1,13 +1,118 @@
package controller
type Activity struct{}
import (
"SciencesServer/app/api/website/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"errors"
)
type ActivityHandle func() *Activity
type Activity struct {
*session.Enterprise
local string
}
func (c *Activity) Instance(title, page, pageSize int) {
type ActivityHandle func(session *session.Enterprise, local string) *Activity
type (
// ActivityInfo 活动信息
ActivityInfo struct {
ID string `json:"id"`
*model.ActivityInstanceInfo
JoinStatus bool `json:"join_status"`
}
// ActivityDetail 详细信息
ActivityDetail struct {
ID string `json:"id"`
*model.ActivityInstanceDetail
JoinStatus bool `json:"join_status"`
}
)
// Instance 活动信息
func (c *Activity) Instance(title string, mode, page, pageSize int) (*controller.ReturnPages, error) {
mActivityInstance := model.NewActivityInstance()
var count int64
var identityUID uint64
if c.Enterprise != nil {
identityUID = c.IdentityUID
}
where := make([]*model2.ModelWhere, 0)
if title != "" {
where = append(where, model2.NewWhereLike("a.title", title))
}
if mode > 0 {
where = append(where, model2.NewWhere("a.mode", mode))
}
out, err := mActivityInstance.Activity(identityUID, page, pageSize, &count)
if err != nil {
return nil, err
}
list := make([]*ActivityInfo, 0)
for _, v := range out {
list = append(list, &ActivityInfo{
ID: v.GetEncodeID(),
ActivityInstanceInfo: v,
JoinStatus: v.JoinID > 0,
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Detail 详细信息
func (c *Activity) Detail(id uint64) (*ActivityDetail, error) {
mActivityInstance := model.NewActivityInstance()
var identityUID uint64
if c.Enterprise != nil {
identityUID = c.IdentityUID
}
out, err := mActivityInstance.Detail(id, identityUID)
if err != nil {
return nil, err
}
return &ActivityDetail{
ID: out.GetEncodeID(),
ActivityInstanceDetail: out,
JoinStatus: out.JoinID > 0.,
}, nil
}
// Join 加入活动
func (c *Activity) Join(id uint64) error {
mActivityInstance := model.NewActivityInstance()
isExist, err := model2.FirstField(mActivityInstance.ActivityInstance, []string{"id", "mode", "join_deadline"},
model2.NewWhere("status", model2.NewWhere("id", id)),
model2.NewWhere("status", model2.ActivityInstanceStatusForShow))
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，活动信息不存在或已被删除")
}
if !mActivityInstance.IsCanJoin() {
return errors.New("操作错误，当前活动信息不可报名")
}
return nil
}
func NewActivity() ActivityHandle {
return nil
return func(session *session.Enterprise, local string) *Activity {
return &Activity{
Enterprise: session,
local: local,
}
}
}

83
app/api/website/model/activity_instance.go Normal file
View File

@ -0,0 +1,83 @@
package model
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
)
// ActivityInstance 活动信息数据
type ActivityInstance struct {
*model.ActivityInstance
}
type (
// ActivityInstanceInfo 活动信息
ActivityInstanceInfo struct {
model.Model
model.Image
*model.ActivityInstanceBasic
JoinID uint64 `json:"-"`
JoinCount int `json:"join_count"`
}
// ActivityInstanceDetail 活动详细信息
ActivityInstanceDetail struct {
*model.ActivityInstance
JoinID uint64 `json:"-"`
JoinCount int `json:"join_count"`
}
)
// Activity 活动信息
func (m *ActivityInstance) Activity(uid uint64, page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*ActivityInstanceInfo, error) {
mActivityJoin := model.NewActivityJoin()
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.title", "a.image", "a.begin_at", "a.finish_at", "a.join_deadline",
"IFNULL(u.id, 0) AS join_id", "j.count AS join_count").
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.identity_uid = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT activity_id, COUNT(id) AS count FROM %s WHERE status = %d AND is_deleted = %d GROUP BY activity_id) AS j ON a.id = j.activity_id",
mActivityJoin.TableName(), model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Where("a.status = ?", model.ActivityInstanceStatusForShow).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*ActivityInstanceInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("a.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// Detail 详细信息
func (m *ActivityInstance) Detail(id, uid uint64) (*ActivityInstanceDetail, error) {
mActivityJoin := model.NewActivityJoin()
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.id", "a.title", "a.image", "a.begin_at", "a.finish_at", "a.join_deadline",
"IFNULL(u.id, 0) AS join_id", "j.count AS join_count").
Joins(fmt.Sprintf("LEFT JOIN %s u ON a.id = u.activity_id AND u.identity_uid = %d AND u.status = %d AND u.is_deleted = %d",
mActivityJoin.TableName(), uid, model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN (SELECT activity_id, COUNT(id) AS count FROM %s WHERE status = %d AND is_deleted = %d GROUP BY activity_id) AS j ON a.id = j.activity_id",
mActivityJoin.TableName(), model.ActivityJoinStatusForSuccess, model.DeleteStatusForNot)).
Where("a.id = ?", id)
out := new(ActivityInstanceDetail)
err := db.Scan(&out).Error
return out, err
}
func NewActivityInstance() *ActivityInstance {
return &ActivityInstance{model.NewActivityInstance()}
}

3
app/common/init.go
View File

@ -134,6 +134,9 @@ func initModel() {
&synchronized{iModel: model.NewTechnologyPaper()}, &synchronized{iModel: model.NewTechnologyProduct()},
&synchronized{iModel: model.NewTechnologyProject()}, &synchronized{iModel: model.NewTechnologyTopic()},
&synchronized{iModel: model.NewServiceDocking()},
// 活动管理
&synchronized{iModel: model.NewActivityInstance()}, &synchronized{iModel: model.NewActivityApply()},
&synchronized{iModel: model.NewActivityExamine()}, &synchronized{iModel: model.NewActivityJoin()},
)
}
func initCacheMode() {

6
app/common/model/activity_apply.go
View File

@ -4,9 +4,11 @@ package model
type ActivityApply struct {
Model
Local
IdentityUID uint64 `gorm:"column:identity_uid;type:int;default:0;comment:用户身份表uuid" json:"-"`
Mode ActivityInstanceMode `gorm:"column:mode;type:tinyint(1);default:1;comment:活动模式" json:"mode"`
IdentityUID uint64 `gorm:"column:identity_uid;type:int;default:0;comment:用户身份表uuid" json:"-"`
Image
Mode ActivityInstanceMode `gorm:"column:mode;type:tinyint(1);default:1;comment:活动模式" json:"mode"`
ActivityInstanceBasic
Amount float64 `gorm:"column:amount;type:decimal(10,2);default:0;comment:活动收费金额" json:"amount"`
Content string `gorm:"column:title;type:text;comment:活动详情" json:"content"`
MaxNumber int `gorm:"column:max_number;type:int(6);default:0;comment:报名限制人数，0不做限制" json:"max_number"`
Status ActivityApplyStatus `gorm:"column:status;type:tinyint(1);default:0;comment:审核状态" json:"status"`

4
app/common/model/activity_examine.go
View File

@ -1,7 +1,11 @@
package model
// ActivityExamine 活动审核数据模型
type ActivityExamine struct {
Model
UID uint64 `gorm:"column:uid;type:int;default:0;comment:用户uuid" json:"-"`
ActivityID uint64 `gorm:"column:activity_id;type:int(11);default:0;comment:活动ID" json:"activity_id"`
Examine
ModelDeleted
ModelAt
}

5
app/common/model/activity_instance.go
View File

@ -6,9 +6,10 @@ import "time"
type ActivityInstance struct {
Model
Local
Identity int `gorm:"column:identity;type:tinyint(3);default:0;comment:身份来源" json:"-"`
Mode ActivityInstanceMode `gorm:"column:mode;type:tinyint(1);default:1;comment:活动模式" json:"mode"`
Mode ActivityInstanceMode `gorm:"column:mode;type:tinyint(1);default:1;comment:活动模式" json:"mode"`
Image
ActivityInstanceBasic
Amount float64 `gorm:"column:amount;type:decimal(10,2);default:0;comment:活动收费金额" json:"amount"`
Content string `gorm:"column:title;type:text;comment:活动详情" json:"content"`
MaxNumber int `gorm:"column:max_number;type:int(6);default:0;comment:报名限制人数，0不做限制" json:"max_number"`
Status ActivityInstanceStatus `gorm:"column:status;type:tinyint(1);default:1;comment:活动状态（1：显示，2：隐藏）" json:"status"`

6
app/common/model/activity_join.go
View File

@ -2,9 +2,9 @@ package model
type ActivityJoin struct {
Model
MUid uint64 `gorm:"column:m_uid;type:int;default:0;comment:用户manage_uuid" json:"-"`
ActivityID uint64 `gorm:"column:activity_id;type:int(11);default:0;comment:活动ID" json:"activity_id"`
Status ActivityJoinStatus `gorm:"column:status;type:tinyint(1);default:1;comment:报名状态（-1：取消，1：报名成功）" json:"status"`
IdentityUID uint64 `gorm:"column:identity_uid;type:int;default:0;comment:用户身份表uuid" json:"-"`
ActivityID uint64 `gorm:"column:activity_id;type:int(11);default:0;comment:活动ID" json:"activity_id"`
Status ActivityJoinStatus `gorm:"column:status;type:tinyint(1);default:1;comment:报名状态（-1：取消，1：报名成功）" json:"status"`
ModelDeleted
ModelAt
}

12
app/session/manage.go
View File

@ -6,13 +6,11 @@ import (
)
type Manage struct {
UID uint64 `json:"uid"` // 唯一标识ID
Token string `json:"token"` // token
Name string `json:"name"` // 名称
Mobile string `json:"mobile"` // 手机号码
IsAdmin bool `json:"is_admin"` // 是否超管
TenantID uint64 `json:"tenant_id"` // 租户ID
TenantKey string `json:"tenant_key"` // 租户标识，用来区别分库管理
UID uint64 `json:"uid"` // 唯一标识ID
Token string `json:"token"` // token
Name string `json:"name"` // 名称
Mobile string `json:"mobile"` // 手机号码
IsAdmin bool `json:"is_admin"` // 是否超管
}
func (this *Manage) SetToken(token string) {