niujiuru 4 недель назад
Родитель
Сommit
f8402960e6
3 измененных файлов с 41 добавлено и 16 удалено
  1. 9 11
      mcu_ctrl_board/mcu_ctrl_board.go
  2. 0 4
      mcu_ctrl_board/proc_rpc2.go
  3. 32 1
      mqtt_reporter/yfkj_handler.go

+ 9 - 11
mcu_ctrl_board/mcu_ctrl_board.go

@@ -13,6 +13,7 @@ const MODULE_NAME = "MCUCtrlBoard"
 
 var (
 	Board *MCUCtrlBoard
+	once  sync.Once
 )
 
 // MCU 控制板对象
@@ -31,15 +32,15 @@ type InitInfo struct {
 
 // 初始化控制板通信串口
 func ModuleInit(info InitInfo) bool {
-	if Board != nil {
-		return true
-	}
+	once.Do(func() { ////////////// 创建单一实例资源
+		Board = &MCUCtrlBoard{
+			DataToMqttCh: make(chan []byte, 1),
+			DataToUartCh: make(chan []byte, 1), RequestPhotoCh: make(chan struct{}, 1),
+			extInfo: info,
+		}
 
-	board := &MCUCtrlBoard{
-		DataToMqttCh: make(chan []byte, 1),
-		DataToUartCh: make(chan []byte, 1), RequestPhotoCh: make(chan struct{}, 1),
-		extInfo: info,
-	}
+		Board.StartUartWriter() ///// 启动串口数据转发
+	})
 
 	var err error
 	for range 3 {
@@ -55,9 +56,6 @@ func ModuleInit(info InitInfo) bool {
 		return false
 	}
 
-	Board = board
-	Board.StartUartWriter()
-
 	return true
 }
 

+ 0 - 4
mcu_ctrl_board/proc_rpc2.go

@@ -165,10 +165,6 @@ func processRPC2(jsonStr string) *C.char {
 
 // 数据回显本地测试方法
 func echo(req *jsonrpc2.Request) (*jsonrpc2.Response, error) {
-	if req.Params == nil {
-		return jsonrpc2.BuildError(req, jsonrpc2.ErrInvalidParams, ""), nil
-	}
-
 	return jsonrpc2.BuildResult(req, req.Params)
 }
 

+ 32 - 1
mqtt_reporter/yfkj_handler.go

@@ -9,6 +9,7 @@ import (
 	"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/utils/jsonrpc2"
 )
 
 func yfkj_handleMessage(client *Client, msg mqtt.Message) {
@@ -104,7 +105,7 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
-	case "dtu_update": ///////////////// 升级RTU(历史原因, 也叫DTU)设备
+	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
 	default:
 		return errors.New("command not supported")
 	}
@@ -113,5 +114,35 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 }
 
 func yfkj_handleRPC2Req(client *Client, msg mqtt.Message) error {
+	var resp *jsonrpc2.Response
+
+	req, err := jsonrpc2.ParseRequest(string(msg.Payload()))
+	if err != nil || req.ID == nil /* 不接受通知类型的消息 */ {
+		resp = jsonrpc2.BuildError(nil, jsonrpc2.ErrParse, "")
+		goto retp
+	}
+
+	switch req.Method {
+	case "echo":
+		resp = jsonrpc2.BuildResponse(req, req.Params, nil)
+	default:
+		resp = jsonrpc2.BuildError(req, jsonrpc2.ErrMethodNotFound, "")
+	}
+
+retp:
+	ack, err := resp.String()
+	if err != nil {
+		return err
+	}
+
+	logData := utils.FormatCompactJSON([]byte(ack))
+	err = client.Publish(client.config.Topics["Pub"], client.config.Qos, false, ack)
+	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
 }