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

[优化] 设置状态监控

Browse Source
This commit is contained in:
PandaX-Go
2024-12-04 21:47:24 +08:00
parent 7c021f8be9
commit ffe6e859af
18 changed files with 314 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
apps/device/util/device_rpc.go
View File

@@ -1,13 +1,11 @@
package util
import (
"context"
"encoding/json"
"errors"
"pandax/apps/device/services"
ruleEntity "pandax/apps/rule/entity"
ruleService "pandax/apps/rule/services"
"pandax/pkg/cache"
devicerpc "pandax/pkg/device_rpc"
"pandax/pkg/global"
"pandax/pkg/rule_engine"
@@ -23,35 +21,33 @@ func BuildRunDeviceRpc(deviceId, mode string, rp devicerpc.RpcPayload) error {
if device.LinkStatus != global.ONLINE {
return errors.New("设备不在线无法设置属性")
}
findOne, err := ruleService.RuleChainModelDao.FindOne(device.Product.RuleChainId)
if err != nil {
global.Log.Error("查询规则链数据失败", err)
return errors.New("查询规则链数据失败")
}
ruleData := ruleEntity.RuleDataJson{}
err = tool.StringToStruct(findOne.RuleDataJson, &ruleData)
if err != nil {
global.Log.Error("规则链数据转化失败", err)
return errors.New("规则链数据转化失败")
}
dataCode := ruleData.LfData.DataCode
code, _ := json.Marshal(dataCode)
//新建规则链实体
instance := &rule_engine.RuleChainInstance{}
ruleInstance, bo := cache.GetProductRule(device.Product.Id)
if !bo {
instance, err = rule_engine.NewRuleChainInstance(findOne.Id, code)
ruleInstance := rule_engine.RuleEngine.GetRuleInstance(device.Product.Id)
if ruleInstance == nil {
findOne, err := ruleService.RuleChainModelDao.FindOne(device.Product.RuleChainId)
if err != nil {
global.Log.Error("查询规则链数据失败", err)
return errors.New("查询规则链数据失败")
}
ruleData := ruleEntity.RuleDataJson{}
err = tool.StringToStruct(findOne.RuleDataJson, &ruleData)
if err != nil {
global.Log.Error("规则链数据转化失败", err)
return errors.New("规则链数据转化失败")
}
dataCode := ruleData.DataCode
code, err := json.Marshal(dataCode)
if err != nil {
global.Log.Error("规则链数据解析失败", err)
return errors.New("规则链数据解析失败")
}
ruleInstance, err = rule_engine.NewRuleChainInstance(findOne.Id, code)
if err != nil {
return err
}
} else {
if data, ok := ruleInstance.(*rule_engine.RuleChainInstance); ok {
instance = data
} else {
return errors.New("规则实体解析错误")
}
rule_engine.RuleEngine.SaveRuleInstance(device.Product.Id, ruleInstance)
}
metadataVals := map[string]interface{}{
"deviceId": device.Id,
"mode": mode,
@@ -62,9 +58,8 @@ func BuildRunDeviceRpc(deviceId, mode string, rp devicerpc.RpcPayload) error {
"orgId": device.OrgId,
"owner": device.Owner,
}
msg := message.NewMessage(device.Owner, message.RpcRequestToDevice, rp.ToMap(), metadataVals)
err = instance.StartRuleChain(context.Background(), msg)
err = rule_engine.RuleEngine.StartRuleInstance(ruleInstance, msg)
if err != nil {
global.Log.Error("规则链执行失败", err)
}