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

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

niujiuru 4 недель назад
Родитель
Сommit
645c56c771
1 измененных файлов с 17 добавлено и 19 удалено
  1. 17 19
      mqtt_reporter/yfkj_handler.go

+ 17 - 19
mqtt_reporter/yfkj_handler.go

@@ -63,27 +63,20 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	var shell string // 1, 控制台指令(运维)
 	if json.Unmarshal(params["shell"], &shell) == nil && shell != "" {
 		err := utils.ExecShell(shell)
-		ack := ""
+		resp := ""
 		if err == nil {
 			data, _ := json.Marshal(map[string]string{
 				"result": fmt.Sprintf("exec %q success", shell),
 			})
-			ack = string(data)
+			resp = string(data)
 		} else {
 			data, _ := json.Marshal(map[string]string{
 				"result": fmt.Sprintf("exec %q failed: %v", shell, err),
 			})
-			ack = string(data)
+			resp = string(data)
 		}
 
-		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)
-		}
+		yfkj_sendResponse(client, resp)
 
 		return nil
 	}
@@ -99,12 +92,15 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	switch req.Cmd {
 	case "reboot", "paramconf", "ctrl", "read", "sensor", "takephoto":
 		if err := mcu_ctrl_board.Board.WriteDataToUart(
-			[]byte(msg.Payload())); err != nil { // 转发这些指令给MCU控制板
+			msg.Payload()); err != nil { ////// 透传转发这些指令给MCU控制板
 			return err
 		}
 	case "update": // MCU控制板升级指令, 先下载固件, 成功后再透传给控制板
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
+		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
+		yfkj_sendResponse(client, string(data))
+		utils.ExecShell("reboot")
 	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
 	default:
 		return errors.New("command not supported")
@@ -130,19 +126,21 @@ func yfkj_handleRPC2Req(client *Client, msg mqtt.Message) error {
 	}
 
 retp:
-	ack, err := resp.String()
-	if err != nil {
-		return err
+	data, err := resp.String()
+	if err == nil {
+		yfkj_sendResponse(client, data)
 	}
 
-	logData := utils.FormatCompactJSON([]byte(ack))
-	err = client.Publish(client.config.Topics["Pub"], client.config.Qos, false, ack)
+	return err
+}
+
+func yfkj_sendResponse(client *Client, payload string) {
+	logData := utils.FormatCompactJSON([]byte(payload))
+	err := client.Publish(client.config.Topics["Pub"], client.config.Qos, false, payload)
 	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
 }