实现发送消息到媒介

internal/rpc/services/service_message_receiver.go

@@ -0,0 +1,171 @@
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/maps"
+)
+
+// MessageReceiverService 消息对象接收人
+type MessageReceiverService struct {
+	BaseService
+}
+
+// UpdateMessageReceivers 创建接收者
+func (this *MessageReceiverService) UpdateMessageReceivers(ctx context.Context, req *pb.UpdateMessageReceiversRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	params := maps.Map{}
+	if len(req.ParamsJSON) > 0 {
+		err = json.Unmarshal(req.ParamsJSON, &params)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	err = this.RunTx(func(tx *dbs.Tx) error {
+		err = models.SharedMessageReceiverDAO.DisableReceivers(tx, req.NodeClusterId, req.NodeId, req.ServerId)
+		if err != nil {
+			return err
+		}
+
+		for messageType, options := range req.RecipientOptions {
+			for _, option := range options.RecipientOptions {
+				_, err := models.SharedMessageReceiverDAO.CreateReceiver(tx, models.MessageTaskTarget{
+					ClusterId: req.NodeClusterId,
+					NodeId:    req.NodeId,
+					ServerId:  req.ServerId,
+				}, messageType, params, option.MessageRecipientId, option.MessageRecipientGroupId)
+				if err != nil {
+					return err
+				}
+			}
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// FindAllMessageReceivers 查找接收者
+func (this *MessageReceiverService) FindAllMessageReceivers(ctx context.Context, req *pb.FindAllMessageReceiversRequest) (*pb.FindAllMessageReceiversResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	receivers, err := models.SharedMessageReceiverDAO.FindAllReceivers(tx, models.MessageTaskTarget{
+		ClusterId: req.NodeClusterId,
+		NodeId:    req.NodeId,
+		ServerId:  req.ServerId,
+	}, "")
+	if err != nil {
+		return nil, err
+	}
+	pbReceivers := []*pb.MessageReceiver{}
+	for _, receiver := range receivers {
+		var pbRecipient *pb.MessageRecipient = nil
+
+		// 接收人
+		if receiver.RecipientId > 0 {
+			recipient, err := models.SharedMessageRecipientDAO.FindEnabledMessageRecipient(tx, int64(receiver.RecipientId))
+			if err != nil {
+				return nil, err
+			}
+			if recipient == nil {
+				continue
+			}
+
+			// 管理员
+			admin, err := models.SharedAdminDAO.FindEnabledAdmin(tx, int64(recipient.AdminId))
+			if err != nil {
+				return nil, err
+			}
+			if admin == nil {
+				continue
+			}
+
+			// 接收人
+			instance, err := models.SharedMessageMediaInstanceDAO.FindEnabledMessageMediaInstance(tx, int64(recipient.InstanceId))
+			if err != nil {
+				return nil, err
+			}
+			if instance == nil {
+				continue
+			}
+
+			pbRecipient = &pb.MessageRecipient{
+				Id: int64(recipient.Id),
+				Admin: &pb.Admin{
+					Id:       int64(admin.Id),
+					Fullname: admin.Fullname,
+					Username: admin.Username,
+					IsOn:     admin.IsOn == 1,
+				},
+				MessageMediaInstance: &pb.MessageMediaInstance{
+					Id:   int64(instance.Id),
+					Name: instance.Name,
+					IsOn: instance.IsOn == 1,
+				},
+				IsOn:                   recipient.IsOn == 1,
+				MessageRecipientGroups: nil,
+				Description:            "",
+				User:                   "",
+			}
+		}
+
+		// 接收人分组
+		var pbRecipientGroup *pb.MessageRecipientGroup = nil
+		if receiver.RecipientGroupId > 0 {
+			group, err := models.SharedMessageRecipientGroupDAO.FindEnabledMessageRecipientGroup(tx, int64(receiver.RecipientGroupId))
+			if err != nil {
+				return nil, err
+			}
+			if group == nil {
+				continue
+			}
+			pbRecipientGroup = &pb.MessageRecipientGroup{
+				Id:   int64(group.Id),
+				Name: group.Name,
+				IsOn: group.IsOn == 1,
+			}
+		}
+
+		pbReceivers = append(pbReceivers, &pb.MessageReceiver{
+			Id:                    int64(receiver.Id),
+			ClusterId:             int64(receiver.ClusterId),
+			NodeId:                int64(receiver.NodeId),
+			ServerId:              int64(receiver.ServerId),
+			Type:                  receiver.Type,
+			ParamsJSON:            []byte(receiver.Params),
+			MessageRecipient:      pbRecipient,
+			MessageRecipientGroup: pbRecipientGroup,
+		})
+	}
+	return &pb.FindAllMessageReceiversResponse{MessageReceivers: pbReceivers}, nil
+}
+
+// DeleteMessageReceiver 删除接收者
+func (this *MessageReceiverService) DeleteMessageReceiver(ctx context.Context, req *pb.DeleteMessageReceiverRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = models.SharedMessageReceiverDAO.DisableMessageReceiver(tx, req.MessageReceiverId)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}

internal/rpc/services/service_message_recipient.go

@@ -19,7 +19,7 @@ func (this *MessageRecipientService) CreateMessageRecipient(ctx context.Context,
 	}
 
 	var tx = this.NullTx()
-	recipientId, err := models.SharedMessageRecipientDAO.CreateRecipient(tx, req.AdminId, req.InstanceId, req.User, req.GroupIds, req.Description)
+	recipientId, err := models.SharedMessageRecipientDAO.CreateRecipient(tx, req.AdminId, req.MessageMediaInstanceId, req.User, req.MessageRecipientGroupIds, req.Description)
 	if err != nil {
 		return nil, err
 	}
@@ -35,7 +35,7 @@ func (this *MessageRecipientService) UpdateMessageRecipient(ctx context.Context,
 	}
 
 	var tx = this.NullTx()
-	err = models.SharedMessageRecipientDAO.UpdateRecipient(tx, req.MessageRecipientId, req.AdminId, req.InstanceId, req.User, req.GroupIds, req.Description, req.IsOn)
+	err = models.SharedMessageRecipientDAO.UpdateRecipient(tx, req.MessageRecipientId, req.AdminId, req.MessageMediaInstanceId, req.User, req.MessageRecipientGroupIds, req.Description, req.IsOn)
 	if err != nil {
 		return nil, err
 	}
@@ -66,7 +66,7 @@ func (this *MessageRecipientService) CountAllEnabledMessageRecipients(ctx contex
 	}
 
 	var tx = this.NullTx()
-	count, err := models.SharedMessageRecipientDAO.CountAllEnabledRecipients(tx, req.AdminId, req.GroupId, req.MediaType, req.Keyword)
+	count, err := models.SharedMessageRecipientDAO.CountAllEnabledRecipients(tx, req.AdminId, req.MessageRecipientGroupId, req.MediaType, req.Keyword)
 	if err != nil {
 		return nil, err
 	}
@@ -82,7 +82,7 @@ func (this *MessageRecipientService) ListEnabledMessageRecipients(ctx context.Co
 	}
 
 	var tx = this.NullTx()
-	recipients, err := models.SharedMessageRecipientDAO.ListAllEnabledRecipients(tx, req.AdminId, req.GroupId, req.MediaType, req.Keyword, req.Offset, req.Size)
+	recipients, err := models.SharedMessageRecipientDAO.ListAllEnabledRecipients(tx, req.AdminId, req.MessageRecipientGroupId, req.MediaType, req.Keyword, req.Offset, req.Size)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_message_task_log.go

@@ -25,7 +25,7 @@ func (this *MessageTaskLogService) CountMessageTaskLogs(ctx context.Context, req
 	return this.SuccessCount(count)
 }
 
-// 列出当页日志
+// ListMessageTaskLogs 列出当页日志
 func (this *MessageTaskLogService) ListMessageTaskLogs(ctx context.Context, req *pb.ListMessageTaskLogsRequest) (*pb.ListMessageTaskLogsResponse, error) {
 	_, err := this.ValidateAdmin(ctx, 0)
 	if err != nil {
@@ -58,6 +58,7 @@ func (this *MessageTaskLogService) ListMessageTaskLogs(ctx context.Context, req
 					Id:   int64(recipient.Id),
 					User: recipient.User,
 				}
+				task.InstanceId = recipient.InstanceId
 			}
 		}
 

internal/rpc/services/service_node_stream.go

@@ -65,7 +65,7 @@ func init() {
 	}()
 }
 
-// 节点stream
+// NodeStream 节点stream
 func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) error {
 	// TODO 使用此stream快速通知边缘节点更新
 	// 校验节点
@@ -114,7 +114,13 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro
 		if err != nil {
 			return err
 		}
-		err = models.SharedMessageDAO.CreateNodeMessage(tx, clusterId, nodeId, models.MessageTypeNodeActive, models.MessageLevelSuccess, "节点已经恢复在线", nil)
+		nodeName, err := models.SharedNodeDAO.FindNodeName(tx, nodeId)
+		if err != nil {
+			return err
+		}
+		subject := "节点\"" + nodeName + "\"已经恢复在线"
+		msg := "节点\"" + nodeName + "\"已经恢复在线"
+		err = models.SharedMessageDAO.CreateNodeMessage(tx, clusterId, nodeId, models.MessageTypeNodeActive, models.MessageLevelSuccess, subject, msg, nil)
 		if err != nil {
 			return err
 		}
@@ -190,7 +196,7 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro
 	}
 }
 
-// 向节点发送命令
+// SendCommandToNode 向节点发送命令
 func (this *NodeService) SendCommandToNode(ctx context.Context, req *pb.NodeStreamMessage) (*pb.NodeStreamMessage, error) {
 	// 校验请求
 	_, _, err := this.ValidateAdminAndUser(ctx, 0, 0)

internal/rpc/services/service_server.go

@@ -446,14 +446,18 @@ func (this *ServerService) UpdateServerNamesAuditing(ctx context.Context, req *p
 	_, userId, err := models.SharedServerDAO.FindServerAdminIdAndUserId(tx, req.ServerId)
 	if userId > 0 {
 		if req.AuditingResult.IsOk {
-			err = models.SharedMessageDAO.CreateMessage(tx, 0, userId, models.MessageTypeServerNamesAuditingSuccess, models.MessageLevelSuccess, "服务域名审核通过", maps.Map{
+			subject := "服务域名审核通过"
+			msg := "服务域名审核通过"
+			err = models.SharedMessageDAO.CreateMessage(tx, 0, userId, models.MessageTypeServerNamesAuditingSuccess, models.MessageLevelSuccess, subject, msg, maps.Map{
 				"serverId": req.ServerId,
 			}.AsJSON())
 			if err != nil {
 				return nil, err
 			}
 		} else {
-			err = models.SharedMessageDAO.CreateMessage(tx, 0, userId, models.MessageTypeServerNamesAuditingFailed, models.LevelError, "服务域名审核失败，原因："+req.AuditingResult.Reason, maps.Map{
+			subject := "服务域名审核失败"
+			msg := "服务域名审核失败，原因：" + req.AuditingResult.Reason
+			err = models.SharedMessageDAO.CreateMessage(tx, 0, userId, models.MessageTypeServerNamesAuditingFailed, models.LevelError, subject, msg, maps.Map{
 				"serverId": req.ServerId,
 			}.AsJSON())
 			if err != nil {