From 354ef31933cb82369d305404104a90cd0bf37bff Mon Sep 17 00:00:00 2001
From: Rice <1840169763@qq.com>
Date: Tue, 26 May 2026 17:08:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=94=B5=E8=A1=A8=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/m9zCtrlTty/config/config.json |  2 +-
 internal/module/m9zTtyApi/cron.go  |  2 +-
 internal/module/m9zTtyApi/init.go  | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/apps/m9zCtrlTty/config/config.json b/apps/m9zCtrlTty/config/config.json
index 43c6657..f0eb270 100644
--- a/apps/m9zCtrlTty/config/config.json
+++ b/apps/m9zCtrlTty/config/config.json
@@ -29,7 +29,7 @@
     "baudRate": "9600"
   },
   "deviceInfo": {
-    "deviceId": "866749078669632",
+    "deviceId": "862809073336480",
     "version": "1.0.2",
     "meterAddr": "0x04",
     "meterFirm": "ADL400"
diff --git a/internal/module/m9zTtyApi/cron.go b/internal/module/m9zTtyApi/cron.go
index e50c0be..67c755d 100644
--- a/internal/module/m9zTtyApi/cron.go
+++ b/internal/module/m9zTtyApi/cron.go
@@ -30,7 +30,7 @@ func ScanM9z() {
 	}
 	defer l.Unlock()
 	/** 挨个查询是否有报警*/
-	cuid := deviceInfo["deviceId"].(string)
+	cuid := g.Config().DeviceInfo.DeviceId
 	for i := 0; i < 10; i++ {
 		read, err := m9z.SubLoopParametersRead(cuid, uint(i))
 		if err != nil {
diff --git a/internal/module/m9zTtyApi/init.go b/internal/module/m9zTtyApi/init.go
index cf4b1be..1cb12f9 100644
--- a/internal/module/m9zTtyApi/init.go
+++ b/internal/module/m9zTtyApi/init.go
@@ -1,18 +1,15 @@
 package m9zApi
 
 import (
-	"encoding/json"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"tgk-touch/internal/module/meterFirm"
 
 	"github.com/towgo/towgo/towgo"
 	"tgk-touch/internal/global"
 )
 
-var deviceInfo map[string]interface{}
-
 func Init() {
-	marshal, _ := json.Marshal(g.Config().DeviceInfo)
-	json.Unmarshal(marshal, &deviceInfo)
+
 	towgo.SetFunc("/m9z/fault/list", faultList)
 	towgo.SetFunc("/m9z/fault/batchExec", execFailByIds)
 	// 获取设备输出状态参数
@@ -81,7 +78,8 @@ func Init() {
 }
 
 func getTouchDeviceId(rpc towgo.JsonRpcConnection) {
-
+	deviceInfo := g.Config().DeviceInfo
+	deviceInfo.MeterFirm = meterFirm.Manager().Get()
 	rpc.WriteResult(deviceInfo)
 }
 func faultDelete(rpc towgo.JsonRpcConnection) {