Просмотр исходного кода

继续编写yfkj_handler.go,对齐公司私有测报灯MQTT后端协议

niujiuru 4 недель назад
Родитель
Сommit
a2f8b0cfe7
3 измененных файлов с 83 добавлено и 27 удалено
  1. 10 11
      mqtt_reporter/client.go
  2. 12 9
      mqtt_reporter/reporter.go
  3. 61 7
      mqtt_reporter/yfkj_handler.go

+ 10 - 11
mqtt_reporter/client.go

@@ -30,15 +30,14 @@ var (
 )
 )
 
 
 type ClientConfig struct {
 type ClientConfig struct {
-	Broker       string //////////////////// 连接服务器的地址
-	BrokerName   string //////////////////// 连接服务器的名字
-	ClientID     string //////////////////// 客户端的唯一标识
-	Username     string //////////////////// 登录服务器的用户
-	Password     string //////////////////// 登录服务器的密码
-	Qos          byte   //////////////////// 传输消息质量等级
-	WillTopic    string //////////////////// 遗嘱消息发送主题
-	WillPayload  string //////////////////// 遗嘱消息发送内容
-	WillRetained bool   //////////////////// 遗嘱消息是否保留
+	Broker      string            ////////// 连接服务器的地址
+	BrokerName  string            ////////// 连接服务器的名字
+	ClientID    string            ////////// 客户端的唯一标识
+	Username    string            ////////// 登录服务器的用户
+	Password    string            ////////// 登录服务器的密码
+	Qos         byte              ////////// 传输消息质量等级
+	Topics      map[string]string ////////// 消息主题名和地址
+	WillPayload string            ////////// 遗嘱消息发送内容
 }
 }
 
 
 type subscription struct {
 type subscription struct {
@@ -78,12 +77,12 @@ func NewClient(config ClientConfig, ctx context.Context) (*Client, error) {
 		SetKeepAlive(10 * time.Second).SetPingTimeout(5 * time.Second). // Ping心跳间隔, 超时时间
 		SetKeepAlive(10 * time.Second).SetPingTimeout(5 * time.Second). // Ping心跳间隔, 超时时间
 		SetOrderMatters(false)
 		SetOrderMatters(false)
 
 
-	if config.WillTopic != "" { //////////////////////////////////////// 设置遗嘱消息 /////////
+	if willTopic := config.Topics["Offline"]; willTopic != "" { // 设置遗嘱消息
 		if config.Qos != MqttQos0 && config.Qos != MqttQos1 && config.Qos != MqttQos2 {
 		if config.Qos != MqttQos0 && config.Qos != MqttQos1 && config.Qos != MqttQos2 {
 			cancel()
 			cancel()
 			return nil, ErrInvalidQoS
 			return nil, ErrInvalidQoS
 		}
 		}
-		opts = opts.SetWill(config.WillTopic, config.WillPayload, config.Qos, config.WillRetained)
+		opts = opts.SetWill(willTopic, config.WillPayload, config.Qos, false)
 	}
 	}
 
 
 	opts.OnConnect = func(c mqtt.Client) {
 	opts.OnConnect = func(c mqtt.Client) {

+ 12 - 9
mqtt_reporter/reporter.go

@@ -115,15 +115,18 @@ func (r *MQTTReporter) initYFKJClient(server MQTTServer, devID string) error {
 	}
 	}
 
 
 	config := ClientConfig{
 	config := ClientConfig{
-		Broker:       server.BrokerAddress,
-		BrokerName:   server.Name,
-		ClientID:     devID,
-		Username:     server.Username,
-		Password:     server.Password,
-		Qos:          qos,
-		WillTopic:    server.Topics.Offline,
-		WillPayload:  fmt.Sprintf(`{"cmd":"offline","ext":{"imei":"%s"}}`, devID),
-		WillRetained: false,
+		Broker:     server.BrokerAddress,
+		BrokerName: server.Name,
+		ClientID:   devID,
+		Username:   server.Username,
+		Password:   server.Password,
+		Qos:        qos,
+		Topics: map[string]string{
+			"Pub":     server.Topics.Pub,
+			"Sub":     server.Topics.Sub,
+			"Offline": server.Topics.Offline,
+		},
+		WillPayload: fmt.Sprintf(`{"cmd":"offline","ext":{"imei":"%s"}}`, devID),
 	}
 	}
 
 
 	client, err := NewClient(config, r.ctx)
 	client, err := NewClient(config, r.ctx)

+ 61 - 7
mqtt_reporter/yfkj_handler.go

@@ -1,8 +1,12 @@
 package mqtt_reporter
 package mqtt_reporter
 
 
 import (
 import (
+	"encoding/json"
+	"fmt"
+
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/baseapp"
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 )
 )
 
 
@@ -10,9 +14,8 @@ func yfkj_handleMessage(client *Client, msg mqtt.Message) {
 	go func() {
 	go func() {
 		if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
 		if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
 			if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
 			if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
-				baseapp.Logger.Errorf("[%s] MQTT服务器 %s 清除主题 %s 的Retained消息失败: %v!!",
+				baseapp.Logger.Warnf("[%s] 清除MQTT服务器 %s 主题 %s 的Retained消息失败: %v!",
 					MODULE_NAME, client.config.BrokerName, msg.Topic(), err)
 					MODULE_NAME, client.config.BrokerName, msg.Topic(), err)
-				return
 			}
 			}
 		}
 		}
 
 
@@ -34,19 +37,70 @@ func yfkj_execLocalFunc(client *Client, msg mqtt.Message) {
 		logFunc = baseapp.Logger.Errorf
 		logFunc = baseapp.Logger.Errorf
 	}
 	}
 
 
-	logFunc("[%s] 从MQTT服务器 %s 收到一条%s消息: %s",
+	logFunc("[%s] 收到MQTT服务器 %s 下发的%s消息: %s",
 		MODULE_NAME, client.config.BrokerName, msgKind, payload)
 		MODULE_NAME, client.config.BrokerName, msgKind, payload)
 
 
+	var err error
 	switch msgType {
 	switch msgType {
 	case "jsondata":
 	case "jsondata":
-		yfkj_handleJSONData(client, msg)
+		err = yfkj_execLegacyCmd(client, msg)
 	case "jsonrpc2":
 	case "jsonrpc2":
-		yfkj_handleJSONRPC2(client, msg)
+		err = yfkj_handleRPC2Req(client, msg)
+	}
+	if err != nil {
+		baseapp.Logger.Errorf("[%s] 处理MQTT服务器 %s 下发的消息失败: %v!!",
+			MODULE_NAME, client.config.BrokerName, err)
 	}
 	}
 }
 }
 
 
-func yfkj_handleJSONData(client *Client, msg mqtt.Message) {
+func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
+	var params map[string]json.RawMessage
+	if err := json.Unmarshal(msg.Payload(), &params); err != nil {
+		return err
+	}
+
+	var shell string // 1, 控制台指令(运维)
+	if json.Unmarshal(params["shell"], &shell) == nil && shell != "" {
+		err := utils.ExecShell(shell)
+		resp := ""
+		if err == nil {
+			data, _ := json.Marshal(map[string]string{
+				"result": fmt.Sprintf("exec %q success", shell),
+			})
+			resp = string(data)
+		} else {
+			data, _ := json.Marshal(map[string]string{
+				"result": fmt.Sprintf("exec %q failed: %v", shell, err),
+			})
+			resp = string(data)
+		}
+		err = client.Publish(client.config.Topics["Pub"], client.config.Qos, false, resp)
+		return err
+	}
+
+	var req struct { // 2, 服务端下发指令
+		Cmd string `json:"cmd"`
+		Ext string `json:"ext"`
+	}
+	if err := json.Unmarshal(msg.Payload(), &req); err != nil {
+		return err
+	}
+
+	switch req.Cmd {
+	case "reboot", "paramconf", "ctrl", "read", "sensor", "takephoto":
+		if err := mcu_ctrl_board.Board.WriteDataToUart(
+			[]byte(msg.Payload())); err != nil { /// 转发这些指令给MCU控制板
+			return err
+		}
+	case "update": /// MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
+	case "hmi_update": // 串口屏升级指令, 先下载固件, 成功后再开始执行升级
+	case "dtu_reboot": ////////////////// 重启RTU(历史原因, 也叫DTU)设备
+	case "dtu_update": ////////////////// 升级RTU(历史原因, 也叫DTU)设备
+	}
+
+	return nil
 }
 }
 
 
-func yfkj_handleJSONRPC2(client *Client, msg mqtt.Message) {
+func yfkj_handleRPC2Req(client *Client, msg mqtt.Message) error {
+	return nil
 }
 }