public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 02:48:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] 规则实体影响的处理时间

Browse Source
This commit is contained in:
PandaX
2023-10-31 13:06:57 +08:00
parent 199fd40676
commit f8322ef3b8
3 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
iothub/hook_message_work/hook_message_work.go
View File

@@ -54,23 +54,15 @@ func (s *HookService) handleOne(msg *netbase.DeviceEventInfo) {
if msg.Type == message.TelemetryMes {
go SendZtWebsocket(msg.DeviceId, msg.Datas)
}
// 获取规则链代码
chain := getRuleChain(msg.DeviceAuth)
if chain == nil {
return
}
dataCode := chain.LfData.DataCode
code, err := json.Marshal(dataCode)
//新建规则链实体
instance, errs := rule_engine.NewRuleChainInstance(chain.Id, code)
if len(errs) > 0 {
global.Log.Error("规则链初始化失败", errs[0])
// 获取规则链代码实体
instance := getRuleChainInstance(msg.DeviceAuth)
if instance == nil {
return
}
ruleMessage := buildRuleMessage(msg.DeviceAuth, msgVals, msg.Type)
err = instance.StartRuleChain(context.Background(), ruleMessage)
if err != nil {
global.Log.Error("规则链执行失败", errs)
global.Log.Error("规则链执行失败", err)
}
// 保存设备影子
if msg.Type != message.RpcRequestFromDevice {
@@ -105,15 +97,16 @@ func (s *HookService) handleOne(msg *netbase.DeviceEventInfo) {
}()
}
// 根据产品Id从缓存中获取规则链，没有就查询
func getRuleChain(etoken *global_model.DeviceAuth) *ruleEntity.RuleDataJson {
// 获取规则实体
func getRuleChainInstance(etoken *global_model.DeviceAuth) *rule_engine.RuleChainInstance {
defer func() {
if err := recover(); err != nil {
global.Log.Error(err)
}
}()
key := etoken.ProductId
get, err := cache.ComputeIfAbsentProductRule(key, func(k any) (any, error) {
instance, err := cache.ComputeIfAbsentProductRule(key, func(k any) (any, error) {
one := services.ProductModelDao.FindOne(k.(string))
rule := ruleService.RuleChainModelDao.FindOne(one.RuleChainId)
var lfData ruleEntity.RuleDataJson
@@ -121,14 +114,19 @@ func getRuleChain(etoken *global_model.DeviceAuth) *ruleEntity.RuleDataJson {
if err != nil {
return nil, err
}
lfData.Id = rule.Id
return lfData, nil
code, err := json.Marshal(lfData.LfData.DataCode)
//新建规则链实体
instance, errs := rule_engine.NewRuleChainInstance(rule.Id, code)
if len(errs) > 0 {
global.Log.Error("规则链初始化失败", errs[0])
return nil, errs[0]
}
return instance, nil
})
biz.ErrIsNil(err, "缓存读取规则链失败")
if ruleData, ok := get.(ruleEntity.RuleDataJson); ok {
return &ruleData
if ruleData, ok := instance.(*rule_engine.RuleChainInstance); ok {
return ruleData
}
biz.ErrIsNil(err, "规则链数据转化失败")
return nil
}