TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-06 10:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

通知媒介可以设置发送频率

Browse Source
This commit is contained in:
GoEdgeLab
2021-08-24 15:46:53 +08:00
parent 17b9eee78d
commit 8c1771331f
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/const/const.go
View File

@@ -21,6 +21,6 @@ const (
NodeVersion = "0.3.0"
UserNodeVersion = "0.0.10"
AuthorityNodeVersion = "0.0.2"
MonitorNodeVersion = "0.0.2"
MonitorNodeVersion = "0.0.3"
DNSNodeVersion = "0.2.0"
)

12
internal/db/models/message_media_instance_dao.go
View File

@@ -79,7 +79,7 @@ func (this *MessageMediaInstanceDAO) FindEnabledMessageMediaInstance(tx *dbs.Tx,
}
// CreateMediaInstance 创建媒介实例
func (this *MessageMediaInstanceDAO) CreateMediaInstance(tx *dbs.Tx, name string, mediaType string, params maps.Map, description string) (int64, error) {
func (this *MessageMediaInstanceDAO) CreateMediaInstance(tx *dbs.Tx, name string, mediaType string, params maps.Map, description string, rateJSON []byte) (int64, error) {
op := NewMessageMediaInstanceOperator()
op.Name = name
op.MediaType = mediaType
@@ -96,13 +96,17 @@ func (this *MessageMediaInstanceDAO) CreateMediaInstance(tx *dbs.Tx, name string
op.Description = description
if len(rateJSON) > 0 {
op.Rate = rateJSON
}
op.IsOn = true
op.State = MessageMediaInstanceStateEnabled
return this.SaveInt64(tx, op)
}
// UpdateMediaInstance 修改媒介实例
func (this *MessageMediaInstanceDAO) UpdateMediaInstance(tx *dbs.Tx, instanceId int64, name string, mediaType string, params maps.Map, description string, isOn bool) error {
func (this *MessageMediaInstanceDAO) UpdateMediaInstance(tx *dbs.Tx, instanceId int64, name string, mediaType string, params maps.Map, description string, rateJSON []byte, isOn bool) error {
if instanceId <= 0 {
return errors.New("invalid instanceId")
}
@@ -122,6 +126,10 @@ func (this *MessageMediaInstanceDAO) UpdateMediaInstance(tx *dbs.Tx, instanceId
}
op.Params = paramsJSON
if len(rateJSON) > 0 {
op.Rate = rateJSON
}
op.Description = description
op.IsOn = isOn
return this.Save(tx, op)

4
internal/db/models/message_media_instance_model.go
View File

@@ -1,6 +1,6 @@
package models
// 消息媒介接收人
// MessageMediaInstance 消息媒介接收人
type MessageMediaInstance struct {
Id uint32 `field:"id"` // ID
Name string `field:"name"` // 名称
@@ -8,6 +8,7 @@ type MessageMediaInstance struct {
MediaType string `field:"mediaType"` // 媒介类型
Params string `field:"params"` // 媒介参数
Description string `field:"description"` // 备注
Rate string `field:"rate"` // 发送频率
State uint8 `field:"state"` // 状态
}
@@ -18,6 +19,7 @@ type MessageMediaInstanceOperator struct {
MediaType interface{} // 媒介类型
Params interface{} // 媒介参数
Description interface{} // 备注
Rate interface{} // 发送频率
State interface{} // 状态
}

6
internal/rpc/services/service_message_media_instance.go
View File

@@ -30,7 +30,7 @@ func (this *MessageMediaInstanceService) CreateMessageMediaInstance(ctx context.
}
}
instanceId, err := models.SharedMessageMediaInstanceDAO.CreateMediaInstance(tx, req.Name, req.MediaType, params, req.Description)
instanceId, err := models.SharedMessageMediaInstanceDAO.CreateMediaInstance(tx, req.Name, req.MediaType, params, req.Description, req.RateJSON)
if err != nil {
return nil, err
}
@@ -54,7 +54,7 @@ func (this *MessageMediaInstanceService) UpdateMessageMediaInstance(ctx context.
}
var tx = this.NullTx()
err = models.SharedMessageMediaInstanceDAO.UpdateMediaInstance(tx, req.MessageMediaInstanceId, req.Name, req.MediaType, params, req.Description, req.IsOn)
err = models.SharedMessageMediaInstanceDAO.UpdateMediaInstance(tx, req.MessageMediaInstanceId, req.Name, req.MediaType, params, req.Description, req.RateJSON, req.IsOn)
if err != nil {
return nil, err
}
@@ -131,6 +131,7 @@ func (this *MessageMediaInstanceService) ListEnabledMessageMediaInstances(ctx co
MessageMedia: pbMedia,
ParamsJSON: []byte(instance.Params),
Description: instance.Description,
RateJSON: []byte(instance.Rate),
})
}
@@ -178,5 +179,6 @@ func (this *MessageMediaInstanceService) FindEnabledMessageMediaInstance(ctx con
MessageMedia: pbMedia,
ParamsJSON: []byte(instance.Params),
Description: instance.Description,
RateJSON: []byte(instance.Rate),
}}, nil
}

4
internal/rpc/services/service_message_task.go
View File

@@ -82,6 +82,7 @@ func (this *MessageTaskService) FindSendingMessageTasks(ctx context.Context, req
Type: instance.MediaType,
},
ParamsJSON: []byte(instance.Params),
RateJSON: []byte(instance.Rate),
},
}
} else { // 没有指定既定的接收人
@@ -106,6 +107,7 @@ func (this *MessageTaskService) FindSendingMessageTasks(ctx context.Context, req
Type: instance.MediaType,
},
ParamsJSON: []byte(instance.Params),
RateJSON: []byte(instance.Rate),
},
}
}
@@ -350,6 +352,7 @@ func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context,
Type: instance.MediaType,
},
ParamsJSON: []byte(instance.Params),
RateJSON: []byte(instance.Rate),
},
}
} else { // 没有指定既定的接收人
@@ -375,6 +378,7 @@ func (this *MessageTaskService) ListMessageTasksWithStatus(ctx context.Context,
Type: instance.MediaType,
},
ParamsJSON: []byte(instance.Params),
RateJSON: []byte(instance.Rate),
},
}
}