[优化]大改动，指令下发采用规则链rpc请求

apps/device/api/device_cmd.go

@@ -2,12 +2,17 @@ package api
 
 // ==========================================================================
 import (
+	"context"
+	"encoding/json"
 	"github.com/PandaXGO/PandaKit/biz"
 	"github.com/PandaXGO/PandaKit/model"
 	"github.com/PandaXGO/PandaKit/restfulx"
-	"pandax/iothub/client/mqttclient"
-	"pandax/iothub/client/tcpclient"
+	ruleEntity "pandax/apps/rule/entity"
+	ruleService "pandax/apps/rule/services"
 	"pandax/pkg/global"
+	"pandax/pkg/global_model"
+	"pandax/pkg/rule_engine"
+	"pandax/pkg/rule_engine/message"
 	"pandax/pkg/tool"
 	"strings"
 	"time"
@@ -44,29 +49,57 @@ func (p *DeviceCmdLogApi) GetDeviceCmdLogList(rc *restfulx.ReqCtx) {
 func (p *DeviceCmdLogApi) InsertDeviceCmdLog(rc *restfulx.ReqCtx) {
 	var data entity.DeviceCmdLog
 	restfulx.BindJsonAndValid(rc, &data)
-	data.Id = tool.GenerateID()
+	//验证指令格式
+	ms := make(map[string]interface{})
+	err := json.Unmarshal([]byte(data.CmdContent), &ms)
+	biz.ErrIsNil(err, "指令格式不正确")
+
+	data.Id = global_model.GenerateID()
 	data.State = "2"
 	data.RequestTime = time.Now().Format("2006-01-02 15:04:05")
 	one := p.DeviceApp.FindOne(data.DeviceId)
 	biz.IsTrue(one.LinkStatus == global.ONLINE, "设备不在线无法下发指令")
-	if one.Product.ProtocolName == global.TCPProtocol {
-		err := tcpclient.Send(data.DeviceId, data.CmdContent)
-		biz.ErrIsNil(err, "指令下发失败")
-		data.State = "0"
-		data.ResponseTime = time.Now().Format("2006-01-02 15:04:05.000")
+	// 查询规则链
+	findOne := ruleService.RuleChainModelDao.FindOne(one.Product.RuleChainId)
+	ruleData := ruleEntity.RuleDataJson{}
+	err = tool.StringToStruct(findOne.RuleDataJson, &ruleData)
+	biz.ErrIsNil(err, "规则链数据转化失败")
+	dataCode := ruleData.LfData.DataCode
+	code, err := json.Marshal(dataCode)
+	//新建规则链实体
+	instance, errs := rule_engine.NewRuleChainInstance(code)
+	if len(errs) > 0 {
+		global.Log.Error("规则链初始化失败", errs[0])
+		return
 	}
-	if one.Product.ProtocolName == global.MQTTProtocol {
-		// 下发指令
-		var rpc = &mqttclient.RpcRequest{Client: mqttclient.MqttClient, Mode: data.Mode}
-		rpc.GetRequestId()
-		res, err := rpc.RequestCmd(mqttclient.RpcPayload{Method: data.CmdName, Params: data.CmdContent})
-		biz.ErrIsNil(err, "指令下发失败")
-		data.State = "0"
+	go func() {
+		// 构建规则链消息
+		metadataVals := map[string]interface{}{
+			"deviceId":       data.DeviceId,
+			"mode":           data.Mode,
+			"deviceName":     one.Name,
+			"deviceType":     one.DeviceType,
+			"deviceProtocol": one.Product.ProtocolName,
+			"productId":      one.Pid,
+			"orgId":          one.OrgId,
+			"owner":          one.Owner,
+		}
+		msg := message.NewMessage(one.Owner, message.RpcRequestToDevice, map[string]interface{}{
+			"method": data.CmdName,
+			"params": ms,
+		}, metadataVals)
+		err = instance.StartRuleChain(context.Background(), msg)
+		if err != nil {
+			global.Log.Error("规则链执行失败", errs)
+			data.State = "1"
+		} else {
+			data.State = "0"
+		}
 		data.ResponseTime = time.Now().Format("2006-01-02 15:04:05.000")
-		data.CmdContent = res
-	}
-	err := p.DeviceCmdLogApp.Insert(data)
-	biz.ErrIsNil(err, "添加指令记录失败")
+		err = p.DeviceCmdLogApp.Insert(data)
+		biz.ErrIsNil(err, "添加指令记录失败")
+	}()
+
 }
 
 // DeleteDeviceCmdLog 删除告警