|
@@ -2,6 +2,7 @@ package mqtt_reporter
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
|
|
+ "errors"
|
|
|
"fmt"
|
|
"fmt"
|
|
|
|
|
|
|
|
mqtt "github.com/eclipse/paho.mqtt.golang"
|
|
mqtt "github.com/eclipse/paho.mqtt.golang"
|
|
@@ -11,16 +12,14 @@ import (
|
|
|
)
|
|
)
|
|
|
|
|
|
|
|
func yfkj_handleMessage(client *Client, msg mqtt.Message) {
|
|
func yfkj_handleMessage(client *Client, msg mqtt.Message) {
|
|
|
- go func() {
|
|
|
|
|
- if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
|
|
|
|
|
- if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
|
|
|
|
|
- baseapp.Logger.Warnf("[%s] 清除MQTT服务器 %s 主题 %s 的Retained消息失败: %v!",
|
|
|
|
|
- MODULE_NAME, client.config.BrokerName, msg.Topic(), err)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if msg.Retained() { /// 收到历史缓存消息, 先通知服务端清除掉(空载荷 + Retain=1)它, 然后再处理
|
|
|
|
|
+ if err := client.Publish(msg.Topic(), client.config.Qos, true, []byte{}); err != nil {
|
|
|
|
|
+ baseapp.Logger.Warnf("[%s] 清除MQTT服务器 %s 主题 %s 的Retained消息失败: %v!",
|
|
|
|
|
+ MODULE_NAME, client.config.BrokerName, msg.Topic(), err)
|
|
|
}
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- yfkj_execLocalFunc(client, msg)
|
|
|
|
|
- }()
|
|
|
|
|
|
|
+ yfkj_execLocalFunc(client, msg)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func yfkj_execLocalFunc(client *Client, msg mqtt.Message) {
|
|
func yfkj_execLocalFunc(client *Client, msg mqtt.Message) {
|
|
@@ -30,15 +29,16 @@ func yfkj_execLocalFunc(client *Client, msg mqtt.Message) {
|
|
|
if msg.Retained() {
|
|
if msg.Retained() {
|
|
|
msgKind = "Retained"
|
|
msgKind = "Retained"
|
|
|
}
|
|
}
|
|
|
- logFunc := baseapp.Logger.Infof
|
|
|
|
|
|
|
+ logFunc := baseapp.Logger.Debugf
|
|
|
|
|
|
|
|
if msgType != "jsondata" && msgType != "jsonrpc2" {
|
|
if msgType != "jsondata" && msgType != "jsonrpc2" {
|
|
|
- msgKind = "不支持的"
|
|
|
|
|
|
|
+ msgKind = "Unsupported"
|
|
|
logFunc = baseapp.Logger.Errorf
|
|
logFunc = baseapp.Logger.Errorf
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ logData := utils.FormatCompactJSON([]byte(payload))
|
|
|
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, logData)
|
|
|
|
|
|
|
|
var err error
|
|
var err error
|
|
|
switch msgType {
|
|
switch msgType {
|
|
@@ -74,8 +74,17 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
})
|
|
})
|
|
|
resp = string(data)
|
|
resp = string(data)
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ logData := utils.FormatCompactJSON([]byte(resp))
|
|
|
err = client.Publish(client.config.Topics["Pub"], client.config.Qos, false, resp)
|
|
err = client.Publish(client.config.Topics["Pub"], client.config.Qos, false, resp)
|
|
|
- return err
|
|
|
|
|
|
|
+ if err != nil {
|
|
|
|
|
+ baseapp.Logger.Errorf("[%s] 向MQTT服务器发送数据: %s -> %s 失败: %v!!",
|
|
|
|
|
+ MODULE_NAME, logData, client.config.BrokerName, err)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ baseapp.Logger.Debugf("[%s] 向MQTT服务器发送数据: %s -> %s 成功", MODULE_NAME, logData, client.config.BrokerName)
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ return nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var req struct { // 2, 服务端下发的指令
|
|
var req struct { // 2, 服务端下发的指令
|
|
@@ -89,13 +98,15 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
switch req.Cmd {
|
|
switch req.Cmd {
|
|
|
case "reboot", "paramconf", "ctrl", "read", "sensor", "takephoto":
|
|
case "reboot", "paramconf", "ctrl", "read", "sensor", "takephoto":
|
|
|
if err := mcu_ctrl_board.Board.WriteDataToUart(
|
|
if err := mcu_ctrl_board.Board.WriteDataToUart(
|
|
|
- []byte(msg.Payload())); err != nil { /// 转发这些指令给MCU控制板
|
|
|
|
|
|
|
+ []byte(msg.Payload())); err != nil { // 转发这些指令给MCU控制板
|
|
|
return err
|
|
return err
|
|
|
}
|
|
}
|
|
|
- case "update": /// MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
|
|
|
|
|
- case "hmi_update": // 串口屏升级指令, 先下载固件, 成功后再开始执行升级
|
|
|
|
|
- case "dtu_reboot": ////////////////// 重启RTU(历史原因, 也叫DTU)设备
|
|
|
|
|
- case "dtu_update": ////////////////// 升级RTU(历史原因, 也叫DTU)设备
|
|
|
|
|
|
|
+ case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
|
|
|
|
|
+ case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
|
|
|
|
|
+ case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
|
|
|
|
|
+ case "dtu_update": ///////////////// 升级RTU(历史原因, 也叫DTU)设备
|
|
|
|
|
+ default:
|
|
|
|
|
+ return errors.New("command not supported")
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return nil
|
|
return nil
|