更新线控器OTA升级逻辑

services/apiprovider/actions.go

@@ -5,11 +5,10 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/gogf/gf/encoding/gjson"
+	"github.com/opentracing/opentracing-go/ext"
 	"sparrow/pkg/productconfig"
 	"sparrow/pkg/rpcs"
 
-	"github.com/opentracing/opentracing-go/ext"
-
 	"github.com/opentracing/opentracing-go"
 
 	"net/http"
@@ -156,15 +155,29 @@ func DeviceUpgrade(device *models.Device, urlparams martini.Params, req *http.Re
 		return
 	}
 	server.Log.Infof("设备OTA升级：%s, %s", param.DeviceId, param.Version)
-	var args rpcs.ArgsDeviceUpgrade
-	args.DeviceId = param.DeviceId
-	args.SudDeviceId = param.SubDeviceId
-	args.Url = param.Url
-	args.Md5 = param.MD5
-	args.Version = param.Version
-	args.FileSize = param.FileSize
+	//var args rpcs.ArgsDeviceUpgrade
+	//args.DeviceId = param.DeviceId
+	//args.SudDeviceId = param.SubDeviceId
+	//args.Url = param.Url
+	//args.Md5 = param.MD5
+	//args.Version = param.Version
+	//args.FileSize = param.FileSize
 	var reply rpcs.ReplyEmptyResult
-	err = server.RPCCallByName(context.Background(), rpcs.MQTTAccessName, "Access.Upgrade", args, &reply)
+
+	args := rpcs.ArgsSendCommand{
+		DeviceId:  param.DeviceId,
+		SubDevice: param.SubDeviceId,
+		Cmd:       "devUpgrade",
+		Params: map[string]interface{}{
+			"md5":       param.MD5,
+			"url":       param.Url,
+			"version":   param.Version,
+			"file_size": param.FileSize,
+		},
+	}
+	err = server.RPCCallByName(nil, rpcs.ControllerName, "Controller.SendCommand", args, &reply)
+
+	//err = server.RPCCallByName(context.Background(), rpcs.MQTTAccessName, "Access.Upgrade", args, &reply)
 	if err != nil {
 		server.Log.Errorf("设备OTA升级失败：", err)
 		r.JSON(http.StatusOK, renderError(ErrSystemFault, err))