wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

by Robin at 20241203

This commit is contained in:
Robin 2024-12-03 14:00:36 +08:00
parent ae5aa3eb87
commit 89e840ec75
11 changed files with 97 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/consts/notif_template.go
View File

@ -122,8 +122,4 @@ const (
FrontendRouteId_Zone = 0 // 空间主页
FrontendRouteId_ZoneMomentEdit = 1 // 重新编辑空间帖子的页面
FrontendRouteId_ZoneRefund = 2 // 空间退款页面
FrontendRouteId_Zone_H5 = 100 // 空间主页-H5
FrontendRouteId_ZoneMomentEdit_H5 = 101 // 重新编辑空间帖子的页面-H5
FrontendRouteId_ZoneRefund_H5 = 102 // 空间退款页面-H5
)

3
api/proto/frontend_route/proto/not_null_def_op.go
View File

@ -6,7 +6,8 @@ func (p *OpCreateReq) ProvideNotNullValue() (params []*validator.JsonParam) {
params = make([]*validator.JsonParam, 0)
params = append(params, validator.NewInt64PtrParam("请确认前端路由表id！", p.FrontendRoute.Id))
params = append(params, validator.NewStringPtrParam("请确认前端路由表路径！", p.FrontendRoute.RoutePath))
params = append(params, validator.NewStringPtrParam("请确认APP前端路由表路径！", p.FrontendRoute.AppRoutePath))
params = append(params, validator.NewStringPtrParam("请确认H5前端路由表路径！", p.FrontendRoute.H5RoutePath))
params = append(params, validator.NewStringPtrParam("请确认前端路由表跳转类型！", p.FrontendRoute.Action))
params = append(params, validator.NewStringPtrParam("请确认前端路由表描述！", p.FrontendRoute.Desc))

2
api/proto/notification/proto/notification_api.go
View File

@ -71,7 +71,7 @@ type ApiReadResp struct {
// op 阅读所有
type ApiReadAllReq struct {
base.BaseRequest
NType int64 `json:"n_type"`
NTypes []int64 `json:"n_types"`
}
type ApiReadAllData struct {

5
app/mix/dao/mongo.go
View File

@ -250,6 +250,7 @@ const (
COLNotifBcstVers = "notif_bcst_vers"
COLNotifBcstReceiveVers = "notif_bcst_receive_vers"
COLNotifReceiveIdSeq = "notif_receive_id_seq"
COLNotifBcstIdSeq = "notif_bcst_id_seq"
COLNotifReceivePull = "notif_receive_pull"
DBEmail = "email"
@ -6621,7 +6622,7 @@ func (m *Mongo) ReadNotifReceiveByIds(ctx *gin.Context, req *notificationproto.A
return result, err
}
func (m *Mongo) ReadAllNotifReceive(ctx *gin.Context, req *notificationproto.ApiReadAllReq) (*qmgo.UpdateResult, error) {
func (m *Mongo) ReadAllNotifReceive(ctx *gin.Context, nType int64) (*qmgo.UpdateResult, error) {
col := m.getColNotifReceive()
update := qmgo.M{
"$set": qmgo.M{
@ -6630,7 +6631,7 @@ func (m *Mongo) ReadAllNotifReceive(ctx *gin.Context, req *notificationproto.Api
}
filter := qmgo.M{
"is_read": consts.NotifReceive_NotRead,
"n_type": req.NType,
"n_type": nType,
}
result, err := col.UpdateAll(ctx, filter, update)
return result, err

24
app/mix/dao/mongo_idseq.go
View File

@ -192,6 +192,11 @@ func (m *Mongo) getColNotifReceiveIdSeq() *qmgo.Collection {
return m.clientMix.Database(DBNotification).Collection(COLNotifReceiveIdSeq)
}
// NotifBcstIdSeq序列表
func (m *Mongo) getColNotifBcstIdSeq() *qmgo.Collection {
return m.clientMix.Database(DBNotification).Collection(COLNotifBcstIdSeq)
}
// account_id发号器
func (m *Mongo) GetAndUpdateAccountIdSeq(ctx *gin.Context) (accountIdSeq *dbstruct.AccountIdSeq, err error) {
col := m.getColAccountIdSeq()
@ -697,3 +702,22 @@ func (m *Mongo) GetAndUpdateNotifReceiveIdSeq(ctx *gin.Context) (notifReceiveIdS
return &notifReceiveIdSeqInstance, err
}
// notif_bcst_id发号器
func (m *Mongo) GetAndUpdateNotifBcstIdSeq(ctx *gin.Context) (notifBcstIdSeq *dbstruct.NotifBcstIdSeq, err error) {
col := m.getColNotifBcstIdSeq()
change := qmgo.Change{
Update: qmgo.M{"$inc": qmgo.M{"seq": 1}},
Upsert: true,
ReturnNew: false,
}
notifBcstIdSeqInstance := dbstruct.NotifBcstIdSeq{}
if err = col.Find(ctx, qmgo.M{"_id": "notif_bcst_id_seq_id"}).Apply(change, &notifBcstIdSeqInstance); err != nil {
logger.Error("change error : %v", err)
return
}
return &notifBcstIdSeqInstance, err
}

38
app/mix/service/apiservice.go
View File

@ -4711,24 +4711,32 @@ func (s *Service) ApiReadNotification(ctx *gin.Context, req *notificationproto.A
func (s *Service) ApiReadAllNotification(ctx *gin.Context, req *notificationproto.ApiReadAllReq) (ec errcode.ErrCode) {
ec = errcode.ErrCodeNotificationSrvOk
// 标记已读
result, err := _DefaultNotifReceive.OpReadAll(ctx, req)
if err != nil {
logger.Error("_DefaultNotifReceive OpReadAll fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
totalDecr := int64(0)
for _, nType := range req.NTypes {
// 标记已读
result, err := _DefaultNotifReceive.OpReadAll(ctx, nType)
if err != nil {
logger.Error("_DefaultNotifReceive OpReadAll fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
// 以真更新的条数decr
key := util.GetNotifUrcIdForRedis(req.BaseRequest.Mid, nType)
_, err = redis.GetRedisClient().DecrBy(key, result.ModifiedCount)
if err != nil {
logger.Error("Redis DecrBy fail, err: %v", err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
totalDecr += result.ModifiedCount
}
// 以真更新的条数decr
key := util.GetNotifUrcIdForRedis(req.BaseRequest.Mid, req.NType)
totalKey := util.GetNotifUrcTotalIdForRedis(req.BaseRequest.Mid)
_, err = redis.GetRedisClient().DecrBy(key, result.ModifiedCount)
if err != nil {
logger.Error("Redis DecrBy fail, err: %v", err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
_, err = redis.GetRedisClient().DecrBy(totalKey, result.ModifiedCount)
_, err := redis.GetRedisClient().DecrBy(totalKey, totalDecr)
if err != nil {
logger.Error("Redis DecrBy fail, err: %v", err)
ec = errcode.ErrCodeNotificationSrvFail

12
app/mix/service/logic/notif_bcst.go
View File

@ -4,7 +4,6 @@ import (
"service/api/consts"
"service/app/mix/dao"
"service/dbstruct"
"service/library/idgenerator"
"service/library/logger"
"time"
@ -24,12 +23,17 @@ func NewNotifBcst(store *dao.Store) (a *NotifBcst) {
func (p *NotifBcst) OpCreate(ctx *gin.Context, notifBcst *dbstruct.NotifBcst) error {
// 只有批量推送的时候有可能碰撞，用obj_type防止碰撞
notifBcst.Id = idgenerator.GenNotifBcstId() + notifBcst.ObjType
notifBcstIdSeq, err := p.store.GetAndUpdateNotifBcstIdSeq(ctx)
if err != nil {
logger.Error("GetAndUpdateNotifBcstIdSeq fail, err: %v", err)
return err
}
notifBcst.Id = notifBcstIdSeq.Seq
notifBcst.Ct = time.Now().Unix()
notifBcst.Ut = time.Now().Unix()
notifBcst.DelFlag = consts.Exist
err := p.store.CreateNotifBcst(ctx, notifBcst)
err = p.store.CreateNotifBcst(ctx, notifBcst)
if err != nil {
logger.Error("CreateNotifBcst fail, err: %v", err)
return err

4
app/mix/service/logic/notif_receive.go
View File

@ -54,8 +54,8 @@ func (p *NotifReceive) OpReadByIds(ctx *gin.Context, req *notificationproto.ApiR
return result, nil
}
func (p *NotifReceive) OpReadAll(ctx *gin.Context, req *notificationproto.ApiReadAllReq) (*qmgo.UpdateResult, error) {
result, err := p.store.ReadAllNotifReceive(ctx, req)
func (p *NotifReceive) OpReadAll(ctx *gin.Context, nType int64) (*qmgo.UpdateResult, error) {
result, err := p.store.ReadAllNotifReceive(ctx, nType)
if err != nil {
logger.Error("ReadAllNotifReceive fail, err: %v", err)
return nil, err

48
app/mix/service/notif_builder_handler.go
View File

@ -235,22 +235,16 @@ func (handler *NotifBuilderHandler) handleSysZoneCreated() {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
// 获取H5跳转路径
frontendrouteh5, err := _DefaultFrontendRoute.GetById(ctx, consts.FrontendRouteId_Zone_H5)
if err != nil {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
hyperlinks := make([]*dbstruct.NotifHyperlink, 0)
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendroute.Action,
Params: frontendroute.RoutePath,
Params: frontendroute.AppRoutePath,
})
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendrouteh5.Action,
Params: frontendrouteh5.RoutePath,
Action: frontendroute.Action,
Params: frontendroute.H5RoutePath,
})
// 获取缩略图
@ -551,22 +545,16 @@ func (handler *NotifBuilderHandler) handleAudZoneMomentRejected() {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
// 获取H5跳转路径
frontendrouteh5, err := _DefaultFrontendRoute.GetById(ctx, consts.FrontendRouteId_ZoneMomentEdit_H5)
if err != nil {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
hyperlinks := make([]*dbstruct.NotifHyperlink, 0)
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendroute.Action,
Params: frontendroute.RoutePath,
Params: frontendroute.AppRoutePath,
})
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendrouteh5.Action,
Params: frontendrouteh5.RoutePath,
Action: frontendroute.Action,
Params: frontendroute.H5RoutePath,
})
// 获取缩略图
@ -629,22 +617,16 @@ func (handler *NotifBuilderHandler) handleAudZoneMomentReeditionRejected() {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
// 获取H5跳转路径
frontendrouteh5, err := _DefaultFrontendRoute.GetById(ctx, consts.FrontendRouteId_ZoneMomentEdit_H5)
if err != nil {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
hyperlinks := make([]*dbstruct.NotifHyperlink, 0)
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendroute.Action,
Params: frontendroute.RoutePath,
Params: frontendroute.AppRoutePath,
})
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendrouteh5.Action,
Params: frontendrouteh5.RoutePath,
Action: frontendroute.Action,
Params: frontendroute.H5RoutePath,
})
// 获取缩略图
@ -716,22 +698,16 @@ func (handler *NotifBuilderHandler) handleVasZoneSuperfanshipPurchased_User() {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
// 获取H5跳转路径
frontendrouteh5, err := _DefaultFrontendRoute.GetById(ctx, consts.FrontendRouteId_Zone_H5)
if err != nil {
logger.Error("_DefaultFrontendRoute GetById fail, err: %v", err)
}
hyperlinks := make([]*dbstruct.NotifHyperlink, 0)
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendroute.Action,
Params: frontendroute.RoutePath,
Params: frontendroute.AppRoutePath,
})
hyperlinks = append(hyperlinks, &dbstruct.NotifHyperlink{
Action: frontendrouteh5.Action,
Params: frontendrouteh5.RoutePath,
Action: frontendroute.Action,
Params: frontendroute.H5RoutePath,
})
argsMap := make(map[string]any)

28
dbstruct/frontend_route.go
View File

@ -1,13 +1,14 @@
package dbstruct
type FrontendRoute struct {
Id *int64 `json:"id" bson:"_id"` // 前端页面路由表id
RoutePath *string `json:"route_path" bson:"route_path"` // 前端页面路由地址
Action *string `json:"action" bson:"action"` // 跳转类型
Desc *string `json:"desc" bson:"desc"` // 前端页面描述
Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间
DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记
Id *int64 `json:"id" bson:"_id"` // 前端页面路由表id
AppRoutePath *string `json:"app_route_path" bson:"app_route_path"` // app前端页面路由地址
H5RoutePath *string `json:"h5_route_path" bson:"h5_route_path"` // h5前端页面路由地址
Action *string `json:"action" bson:"action"` // 跳转类型
Desc *string `json:"desc" bson:"desc"` // 前端页面描述
Ct *int64 `json:"ct" bson:"ct"` // 创建时间
Ut *int64 `json:"ut" bson:"ut"` // 更新时间
DelFlag *int64 `json:"del_flag" bson:"del_flag"` // 删除标记
}
func (p *FrontendRoute) GetId() int64 {
@ -17,11 +18,18 @@ func (p *FrontendRoute) GetId() int64 {
return *p.Id
}
func (p *FrontendRoute) GetRoutePath() string {
if p == nil || p.RoutePath == nil {
func (p *FrontendRoute) GetAppRoutePath() string {
if p == nil || p.AppRoutePath == nil {
return ""
}
return *p.RoutePath
return *p.AppRoutePath
}
func (p *FrontendRoute) GetH5RoutePath() string {
if p == nil || p.H5RoutePath == nil {
return ""
}
return *p.H5RoutePath
}
func (p *FrontendRoute) GetAction() string {

4
dbstruct/idSeq.go
View File

@ -100,3 +100,7 @@ type NotificationIdSeq struct {
type NotifReceiveIdSeq struct {
Seq int64 //用户Id序列号
}
type NotifBcstIdSeq struct {
Seq int64 //用户Id序列号
}