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

by Robin at 20241021

This commit is contained in:
Leufolium 2024-10-21 16:07:56 +08:00
parent c3fa461b9a
commit a5f6c2d931
11 changed files with 226 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/errcode/errcode.go
View File

@ -247,10 +247,11 @@ var ErrCodeMsgMap = map[ErrCode]string{
ErrCodeVideoModerationSrvFail: "视频审核服务错误",
ErrCodeVideoModerationNotExist: "视频审核不存在",
ErrCodeNotificationSrvFail: "系统通知表服务错误",
ErrCodeNotificationNotExist: "系统通知表不存在",
ErrCodeNotificationPushFail: "系统通知表推送失败",
ErrCodeNotificationPullFail: "系统通知表拉取失败",
ErrCodeNotificationSrvFail: "系统通知表服务错误",
ErrCodeNotificationNotExist: "系统通知表不存在",
ErrCodeNotificationPushFail: "系统通知表推送失败",
ErrCodeNotificationPullFail: "系统通知表拉取失败",
ErrCodeNotificationWrongStatusForCancellation: "仅可撤销待推送的系统通知",
ErrCodeRavenIQTestSrvFail: "瑞文智商测试表服务错误",
ErrCodeRavenIQTestNotExist: "瑞文智商测试表不存在",
@ -593,11 +594,12 @@ const (
ErrCodeVideoModerationNotExist ErrCode = -44002 // 视频审核不存在
// Notification: 46xxx
ErrCodeNotificationSrvOk ErrCode = ErrCodeOk
ErrCodeNotificationSrvFail ErrCode = -46001 // 系统通知表服务错误
ErrCodeNotificationNotExist ErrCode = -46002 // 系统通知表不存在
ErrCodeNotificationPushFail ErrCode = -46003 // 系统通知表推送失败
ErrCodeNotificationPullFail ErrCode = -46004 // 系统通知表拉取失败
ErrCodeNotificationSrvOk ErrCode = ErrCodeOk
ErrCodeNotificationSrvFail ErrCode = -46001 // 系统通知表服务错误
ErrCodeNotificationNotExist ErrCode = -46002 // 系统通知表不存在
ErrCodeNotificationPushFail ErrCode = -46003 // 系统通知表推送失败
ErrCodeNotificationPullFail ErrCode = -46004 // 系统通知表拉取失败
ErrCodeNotificationWrongStatusForCancellation ErrCode = -46005 // 系统通知表状态错误
// Media: 60xxx
ErrCodeMediaSrvOk ErrCode = ErrCodeOk

14
api/proto/notification/proto/notification_op.go
View File

@ -65,3 +65,17 @@ type OpListByMidResp struct {
base.BaseResponse
Data *OpListByMidData `json:"data"`
}
// op 撤销
type OpCancelReq struct {
base.BaseRequest
Nid int64 `json:"nid"`
}
type OpCancelData struct {
}
type OpCancelResp struct {
base.BaseResponse
Data *OpCancelData `json:"data"`
}

2
app/mix/controller/init.go
View File

@ -299,6 +299,7 @@ func Init(r *gin.Engine) {
// 系统通知表
apiNotificationGroup := r.Group("/api/notification", PrepareToC())
apiNotificationGroup.POST("list_by_mid", middleware.JSONParamValidator(notificationproto.ApiListByMidReq{}), middleware.JwtAuthenticator(), ApiGetNotificationListByMid)
apiNotificationGroup.POST("receive", middleware.JSONParamValidator(notificationproto.ApiReceiveReq{}), middleware.JwtAuthenticator(), ApiReceiveAllBcstedNotifs)
// =============================== 以下是服务，只允许内网调用 ===============================
@ -602,6 +603,7 @@ func Init(r *gin.Engine) {
//opNotificationGroup.POST("update", middleware.JSONParamValidator(notificationproto.OpUpdateReq{}), middleware.JwtAuthenticator(), OpUpdateNotification)
opNotificationGroup.POST("delete", middleware.JSONParamValidator(notificationproto.OpDeleteReq{}), middleware.JwtAuthenticator(), OpDeleteNotification)
opNotificationGroup.POST("list_by_mid", middleware.JSONParamValidator(notificationproto.OpListByMidReq{}), middleware.JwtAuthenticator(), OpGetNotificationListByMid)
opNotificationGroup.POST("cancel", middleware.JSONParamValidator(notificationproto.OpCancelReq{}), middleware.JwtAuthenticator(), OpCancelNotification)
// 慧用工下发打款历史表
// opSingleDistributeHisGroup := r.Group("/api/single_distribute_his", PrepareOp())

12
app/mix/controller/notification_api.go
View File

@ -35,3 +35,15 @@ func ApiGetNotificationListByMid(ctx *gin.Context) {
}
ReplyOk(ctx, data)
}
func ApiReceiveAllBcstedNotifs(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*notificationproto.ApiReceiveReq)
ec := service.DefaultService.ApiReceiveAllBcstedNotifs(ctx, req)
if ec != errcode.ErrCodeNotificationSrvOk {
logger.Error("ApiReceiveAllBcstedNotifs fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsg(ctx, ec)
return
}
ReplyOk(ctx, nil)
}

12
app/mix/controller/notification_op.go
View File

@ -71,3 +71,15 @@ func OpGetNotificationListByMid(ctx *gin.Context) {
}
ReplyOk(ctx, data)
}
func OpCancelNotification(ctx *gin.Context) {
req := ctx.MustGet("client_req").(*notificationproto.OpCancelReq)
ec := service.DefaultService.OpCancelNotification(ctx, req)
if ec != errcode.ErrCodeNotificationSrvOk {
logger.Error("OpCancelNotification fail, req: %v, ec: %v", util.ToJson(req), ec)
ReplyErrCodeMsg(ctx, ec)
return
}
ReplyOk(ctx, nil)
}

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

@ -6269,6 +6269,22 @@ func (m *Mongo) GetNotificationListByMid(ctx *gin.Context, req *notificationprot
return list, err
}
func (m *Mongo) GetNotificationListByPushTimeAndStatus(ctx *gin.Context, pushTime, status int64) ([]*dbstruct.Notification, error) {
list := make([]*dbstruct.Notification, 0)
col := m.getColNotification()
query := qmgo.M{
"push_time": pushTime,
"status": status,
"del_flag": 0,
}
err := col.Find(ctx, query).Sort("-ct").All(&list)
if err == qmgo.ErrNoSuchDocuments {
err = nil
return list, err
}
return list, err
}
func (m *Mongo) GetNotificationListByIds(ctx *gin.Context, ids []int64) ([]*dbstruct.Notification, error) {
list := make([]*dbstruct.Notification, 0)
col := m.getColNotification()
@ -6286,6 +6302,21 @@ func (m *Mongo) GetNotificationListByIds(ctx *gin.Context, ids []int64) ([]*dbst
return list, err
}
func (m *Mongo) GetNotificationListById(ctx *gin.Context, id int64) (*dbstruct.Notification, error) {
one := &dbstruct.Notification{}
col := m.getColNotification()
query := qmgo.M{
"_id": id,
"del_flag": 0,
}
err := col.Find(ctx, query).One(one)
if err == qmgo.ErrNoSuchDocuments {
err = nil
return nil, err
}
return one, err
}
func (m *Mongo) UpdateNotificationByIds(ctx *gin.Context, notification *dbstruct.Notification, ids []int64) error {
col := m.getColNotification()
query := qmgo.M{

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

@ -4260,13 +4260,22 @@ func (s *Service) ApiGetRavenIQTestList(ctx *gin.Context, req *Raven_IQ_testprot
func (s *Service) ApiGetNotificationListByMid(ctx *gin.Context, req *notificationproto.ApiListByMidReq) (list []*dbstruct.Notification, ec errcode.ErrCode) {
ec = errcode.ErrCodeNotificationSrvOk
// 查询得到已经拉取到的
list, err := _DefaultNotification.OpListByMid(ctx, &notificationproto.OpListByMidReq{
Uid: goproto.Int64(req.BaseRequest.Mid),
})
// 查询得到已经拉取到的通知
notifReceives, err := _DefaultNotifReceive.OpListByObjMid(ctx, req.BaseRequest.Mid, int64(req.Offset), int64(req.Limit))
if err != nil {
logger.Error("ApiGetNotificationList fail, req: %v, err: %v", util.ToJson(req), err)
logger.Error("OpListByObjMid fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
nids := make([]int64, 0)
for _, notifReceive := range notifReceives {
nids = append(nids, notifReceive.Nid)
}
// 获取通知信息
list, err = _DefaultNotification.GetListByIds(ctx, nids)
if err != nil {
logger.Error("GetListByIds fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
}

18
app/mix/service/logic/notification.go
View File

@ -72,6 +72,24 @@ func (p *Notification) OpListByMid(ctx *gin.Context, req *notificationproto.OpLi
return list, nil
}
func (p *Notification) GetListByPushTimeAndStatus(ctx *gin.Context, pushTime, status int64) ([]*dbstruct.Notification, error) {
list, err := p.store.GetNotificationListByPushTimeAndStatus(ctx, pushTime, status)
if err != nil {
logger.Error("GetNotificationListByPushTimeAndStatus fail, err: %v", err)
return make([]*dbstruct.Notification, 0), err
}
return list, nil
}
func (p *Notification) GetListById(ctx *gin.Context, id int64) (*dbstruct.Notification, error) {
notification, err := p.store.GetNotificationListById(ctx, id)
if err != nil {
logger.Error("GetNotificationListById fail, id: %v, err: %v", id, err)
return nil, err
}
return notification, nil
}
func (p *Notification) GetListByIds(ctx *gin.Context, ids []int64) ([]*dbstruct.Notification, error) {
list, err := p.store.GetNotificationListByIds(ctx, ids)
if err != nil {

40
app/mix/service/service.go
View File

@ -5078,3 +5078,43 @@ func (s *Service) OpGetNotificationListByMid(ctx *gin.Context, req *notification
}
return
}
func (s *Service) OpCancelNotification(ctx *gin.Context, req *notificationproto.OpCancelReq) (ec errcode.ErrCode) {
ec = errcode.ErrCodeNotificationSrvOk
notification, err := _DefaultNotification.GetListById(ctx, req.Nid)
if err != nil {
logger.Error("GetNotificationListById fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
if notification == nil {
logger.Error("No notification entity was found")
ec = errcode.ErrCodeNotificationNotExist
return
}
if notification.GetStatus() != consts.Notification_Created {
logger.Error("Wrong status for notification cancellation")
ec = errcode.ErrCodeNotificationWrongStatusForCancellation
return
}
err = _DefaultNotification.OpUpdate(ctx, &notificationproto.OpUpdateReq{
Notification: &dbstruct.Notification{
Id: goproto.Int64(req.Nid),
Status: goproto.Int64(consts.Notification_Cancelled),
},
})
if err == qmgo.ErrNoSuchDocuments {
ec = errcode.ErrCodeNotificationNotExist
err = nil
return
}
if err != nil {
logger.Error("OpUpdate fail, req: %v, err: %v", util.ToJson(req), err)
ec = errcode.ErrCodeNotificationSrvFail
return
}
return
}

57
app/mix/service/xxljob_tasks.go
View File

@ -607,3 +607,60 @@ func (s *CronService) ClearAutoResponseCreateTimes(ctx context.Context, param *x
logger.Info("auto_response_create_times collection has been cleared")
return "auto_response_create_times collection has been cleared"
}
func (s *CronService) PushNotifications(ctx context.Context, param *xxl.RunReq) (msg string) {
logger.Info("task %v param: %v log_id: %v", param.ExecutorHandler, param.ExecutorParams, xxl.Int64ToStr(param.LogID))
logger.Info("Pushing notifications...")
//拿到现在的时间戳
nowTimeStamp := util.GetMinuteStartTimeStamp(time.Now())
ctxt := &gin.Context{}
// 查询所有应在这个时间被推送的通知
notifs, err := _DefaultNotification.GetListByPushTimeAndStatus(ctxt, nowTimeStamp, consts.Notification_Created)
if err != nil {
logger.Error("GetListByPushTimeAndStatus fail: %v", err)
return fmt.Sprintf("GetListByPushTimeAndStatus fail: %v", err)
}
if len(notifs) == 0 {
return "no notification is to be pushed"
}
isProcSuccessful := true
// 推送这些通知
nidsMap := make(map[int64][]int64)
nidsMap[consts.Notification_ObjType_AllStreamer] = make([]int64, 0)
nidsMap[consts.Notification_ObjType_AllUser] = make([]int64, 0)
nidsMap[consts.Notification_ObjType_AllStreamerAndUser] = make([]int64, 0)
for _, notif := range notifs {
// 如果是自定义通知，则直接推送
if notif.GetObjType() == consts.Notification_ObjType_Customized {
err = DefaultNotifBcstCenter.BcstNotifs(ctxt, []int64{notif.GetId()}, consts.Notification_ObjType_Customized, notif.ObjMids)
if err != nil {
logger.Error("DefaultNotifBcstCenter BcstNotifs fail: %v", err)
isProcSuccessful = false
}
} else {
// 如果不是，则统计nid，一起推送
nidsMap[notif.GetObjType()] = append(nidsMap[notif.GetObjType()], notif.GetId())
}
}
objTypes := []int64{consts.Notification_ObjType_AllStreamer, consts.Notification_ObjType_AllUser, consts.Notification_ObjType_AllStreamerAndUser}
for _, objType := range objTypes {
err = DefaultNotifBcstCenter.BcstNotifs(ctxt, nidsMap[objType], objType, nil)
if err != nil {
logger.Error("DefaultNotifBcstCenter BcstNotifs fail: %v", err)
isProcSuccessful = false
}
}
if isProcSuccessful {
logger.Info("all notifications have been pushed")
return "all notifications have been pushed"
} else {
logger.Info("some notifications failed to push, check your database or logs for more info")
return "some notifications failed to push, check your database or logs for more info"
}
}

14
dbstruct/notification.go
View File

@ -26,6 +26,20 @@ func (p *Notification) GetId() int64 {
return 0
}
func (p *Notification) GetObjType() int64 {
if p != nil && p.ObjType != nil {
return *p.ObjType
}
return 0
}
func (p *Notification) GetStatus() int64 {
if p != nil && p.Status != nil {
return *p.Status
}
return 0
}
func (p *Notification) GetPushTime() int64 {
if p != nil && p.PushTime != nil {
return *p.PushTime