ソースを参照

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

niujiuru 3 週間 前
親
コミット
f6258ca005
3 ファイル変更、56 行追加、10 行削除
  1. 5 1
      mcu_ctrl_board/upgrade_hmi.go
  2. 4 4
      mqtt_reporter/config.go
  3. 47 5
      mqtt_reporter/yfkj_handler.go

+ 5 - 1
mcu_ctrl_board/upgrade_hmi.go

@@ -17,7 +17,7 @@ const (
 )
 )
 
 
 // 开始HMI屏幕固件升级(异步协程执行)
 // 开始HMI屏幕固件升级(异步协程执行)
-func StartHMIUpgrade(filePath string) error {
+func StartHMIUpgrade(filePath string, onSuccess func(any), callbackArg any) error {
 	if !Board.upgradeMu.TryLock() {
 	if !Board.upgradeMu.TryLock() {
 		return fmt.Errorf("upgrade busy")
 		return fmt.Errorf("upgrade busy")
 	}
 	}
@@ -46,6 +46,10 @@ func StartHMIUpgrade(filePath string) error {
 
 
 		elapsed := time.Since(startTime)
 		elapsed := time.Since(startTime)
 		baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
 		baseapp.Logger.Warnf("====[ HMI UPGRADE SUCCESS ]====, 用时: %v", elapsed) //成功
+
+		if onSuccess != nil {
+			onSuccess(callbackArg)
+		}
 	}()
 	}()
 
 
 	return nil
 	return nil

+ 4 - 4
mqtt_reporter/config.go

@@ -88,19 +88,19 @@ const defaultConfig = `{
       "enable": true,
       "enable": true,
       "hwtype": "mcu",
       "hwtype": "mcu",
       "sftype": "cbd",
       "sftype": "cbd",
-      "getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/MCU/cbd/rtthread.rbl"
+      "getUrl": "ftp://cbd_user:YFkj@6O2O@8.136.98.49:21/rtu_bsp_framework/cbd-manual-upgrade/MCUUpgrade.rbl"
     },
     },
     {
     {
       "enable": true,
       "enable": true,
       "hwtype": "hmi",
       "hwtype": "hmi",
       "sftype": "cbd",
       "sftype": "cbd",
-      "getUrl": "ftp://cbd_user:YFkj%406O2O@8.136.98.49:21/_UPDATE_FILE/HMI/cbd_hmi.zip"
+      "getUrl": "ftp://cbd_user:YFkj@6O2O@8.136.98.49:21/rtu_bsp_framework/cbd-manual-upgrade/HMIUpgrade.zip"
     },
     },
     {
     {
-      "enable": false,
+      "enable": true,
       "hwtype": "rtu",
       "hwtype": "rtu",
       "sftype": "cbd",
       "sftype": "cbd",
-      "getUrl": ""
+      "getUrl": "ftp://cbd_user:YFkj@6O2O@8.136.98.49:21/rtu_bsp_framework/cbd-manual-upgrade/RTUUpgrade.tgz"
     }
     }
   ]
   ]
 }`
 }`

+ 47 - 5
mqtt_reporter/yfkj_handler.go

@@ -83,8 +83,8 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 	}
 	}
 
 
 	var req struct { // 2, 服务端下发的指令
 	var req struct { // 2, 服务端下发的指令
-		Cmd string `json:"cmd"`
-		Ext string `json:"ext"`
+		Cmd string          `json:"cmd"`
+		Ext json.RawMessage `json:"ext"`
 	}
 	}
 	if err := json.Unmarshal(msg.Payload(), &req); err != nil {
 	if err := json.Unmarshal(msg.Payload(), &req); err != nil {
 		return err
 		return err
@@ -107,10 +107,14 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
+
 		if err := mcu_ctrl_board.Board.WriteDataToUart(
 		if err := mcu_ctrl_board.Board.WriteDataToUart(
 			msg.Payload()); err != nil {
 			msg.Payload()); err != nil {
 			return err
 			return err
 		}
 		}
+
+		data, _ := json.Marshal(map[string]string{"result": "mcu will upgrade !"})
+		yfkj_sendResponse(client, string(data))
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 	case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
 		url := reporter.config.GetUpgradeURL("hmi", "cbd")
 		url := reporter.config.GetUpgradeURL("hmi", "cbd")
 		if url == "" {
 		if url == "" {
@@ -122,14 +126,39 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
 		if err != nil {
 		if err != nil {
 			return err
 			return err
 		}
 		}
-		if err := mcu_ctrl_board.StartHMIUpgrade(filePath); err != nil {
+
+		if err := mcu_ctrl_board.StartHMIUpgrade(
+			filePath, yfkj_onHMIUpgradeSuccess, client); err != nil {
 			return err
 			return err
 		}
 		}
+
+		data, _ := json.Marshal(map[string]string{"result": "hmi will upgrade !"})
+		yfkj_sendResponse(client, string(data))
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
 	case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
 		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
 		data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
 		yfkj_sendResponse(client, string(data))
 		yfkj_sendResponse(client, string(data))
-		utils.ExecShell("reboot") ///// 设备重启
+		if err := utils.ExecShell("reboot"); err != nil {
+			return err
+		}
 	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
 	case "dtu_update": //// 升级RTU(历史原因, 也叫DTU)设备, 先下载后升级
+		url := reporter.config.GetUpgradeURL("rtu", "cbd")
+		if url == "" {
+			baseapp.Logger.Warnf("[%s] 未找到有效的升级配置", MODULE_NAME)
+			return nil
+		}
+		filePath := filepath.Join(baseapp.VAR_DIR, "RTUUpgrade.tgz")
+		err := utils.DownloadFile(url, filePath)
+		if err != nil {
+			return err
+		}
+
+		cmd := "tar xzf " + filePath + " -C " + baseapp.EXEC_DIR
+		if err := utils.ExecShell(cmd); err != nil {
+			return err
+		}
+
+		data, _ := json.Marshal(map[string]string{"result": "rtu upgrade success"})
+		yfkj_sendResponse(client, string(data))
 	default:
 	default:
 		return errors.New("command not supported")
 		return errors.New("command not supported")
 	}
 	}
@@ -141,10 +170,13 @@ func yfkj_handleRPC2Req(client *Client, msg mqtt.Message) error {
 	var resp *jsonrpc2.Response
 	var resp *jsonrpc2.Response
 
 
 	req, err := jsonrpc2.ParseRequest(string(msg.Payload()))
 	req, err := jsonrpc2.ParseRequest(string(msg.Payload()))
-	if err != nil || req.ID == nil /* 不接受通知类型的消息 */ {
+	if err != nil {
 		resp = jsonrpc2.BuildError(nil, jsonrpc2.ErrParse, "")
 		resp = jsonrpc2.BuildError(nil, jsonrpc2.ErrParse, "")
 		goto retp
 		goto retp
 	}
 	}
+	if req.ID == nil {
+		return nil
+	}
 
 
 	switch req.Method {
 	switch req.Method {
 	case "echo":
 	case "echo":
@@ -172,3 +204,13 @@ func yfkj_sendResponse(client *Client, payload string) {
 		baseapp.Logger.Debugf("[%s] 向MQTT服务器发送数据: %s -> %s 成功", MODULE_NAME, logData, client.config.BrokerName)
 		baseapp.Logger.Debugf("[%s] 向MQTT服务器发送数据: %s -> %s 成功", MODULE_NAME, logData, client.config.BrokerName)
 	}
 	}
 }
 }
+
+func yfkj_onHMIUpgradeSuccess(arg any) {
+	client, ok := arg.(*Client)
+	if !ok || client == nil {
+		return
+	}
+
+	data, _ := json.Marshal(map[string]string{"result": "hmi upgrade success"})
+	yfkj_sendResponse(client, string(data))
+}