|
|
@@ -83,8 +83,8 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
}
|
|
|
|
|
|
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 {
|
|
|
return err
|
|
|
@@ -107,10 +107,14 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+
|
|
|
if err := mcu_ctrl_board.Board.WriteDataToUart(
|
|
|
msg.Payload()); err != nil {
|
|
|
return err
|
|
|
}
|
|
|
+
|
|
|
+ data, _ := json.Marshal(map[string]string{"result": "mcu will upgrade !"})
|
|
|
+ yfkj_sendResponse(client, string(data))
|
|
|
case "hmi_update": //串口屏升级指令, 先下载固件, 成功后再开始执行升级
|
|
|
url := reporter.config.GetUpgradeURL("hmi", "cbd")
|
|
|
if url == "" {
|
|
|
@@ -122,14 +126,39 @@ func yfkj_execLegacyCmd(client *Client, msg mqtt.Message) error {
|
|
|
if err != nil {
|
|
|
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
|
|
|
}
|
|
|
+
|
|
|
+ data, _ := json.Marshal(map[string]string{"result": "hmi will upgrade !"})
|
|
|
+ yfkj_sendResponse(client, string(data))
|
|
|
case "dtu_reboot": ///////////////// 重启RTU(历史原因, 也叫DTU)设备
|
|
|
data, _ := json.Marshal(map[string]string{"result": "system will reboot"})
|
|
|
yfkj_sendResponse(client, string(data))
|
|
|
- utils.ExecShell("reboot") ///// 设备重启
|
|
|
+ if err := utils.ExecShell("reboot"); err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
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:
|
|
|
return errors.New("command not supported")
|
|
|
}
|
|
|
@@ -141,10 +170,13 @@ 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 /* 不接受通知类型的消息 */ {
|
|
|
+ if err != nil {
|
|
|
resp = jsonrpc2.BuildError(nil, jsonrpc2.ErrParse, "")
|
|
|
goto retp
|
|
|
}
|
|
|
+ if req.ID == nil {
|
|
|
+ return nil
|
|
|
+ }
|
|
|
|
|
|
switch req.Method {
|
|
|
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)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+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))
|
|
|
+}
|