From 25474f851e6febe55f37ececf1672528484e04a8 Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Sat, 27 Sep 2025 01:09:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/service/device/general_device_service.go | 2 +- internal/infra/models/device.go | 1 - internal/infra/transport/lora/chirp_stack.go | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/app/service/device/general_device_service.go b/internal/app/service/device/general_device_service.go index 7c8015d..964d207 100644 --- a/internal/app/service/device/general_device_service.go +++ b/internal/app/service/device/general_device_service.go @@ -57,7 +57,7 @@ func (g *GeneralDeviceService) Switch(device *models.Device, action DeviceAction return fmt.Errorf("解析设备 %v(id=%v) 配置失败: %v", device.Name, device.ID, err) } - // TODO 这种校验放自检里 (已通过 SelfCheck 保证其为纯数字，此处仅进行类型转换) + // 已通过 SelfCheck 保证其为纯数字，此处仅进行类型转换 busNumber, _ := strconv.Atoi(fmt.Sprintf("%v", deviceInfo[models.BusNumber])) busAddress, _ := strconv.Atoi(fmt.Sprintf("%v", deviceInfo[models.BusAddress])) relayChannel, _ := strconv.Atoi(fmt.Sprintf("%v", deviceInfo[models.RelayChannel])) diff --git a/internal/infra/models/device.go b/internal/infra/models/device.go index 5eee658..c3cc889 100644 --- a/internal/infra/models/device.go +++ b/internal/infra/models/device.go @@ -118,7 +118,6 @@ func (d *Device) ParseProperties(v interface{}) error { // SelfCheck 进行参数自检, 返回检测结果 // 方法会根据自身类型进行参数检查, 参数不全时返回false -// TODO 没写单测 func (d *Device) SelfCheck() bool { // 使用清晰的 switch 结构，确保所有情况都被覆盖 switch d.Type { diff --git a/internal/infra/transport/lora/chirp_stack.go b/internal/infra/transport/lora/chirp_stack.go index aaa05dc..6bc4a2c 100644 --- a/internal/infra/transport/lora/chirp_stack.go +++ b/internal/infra/transport/lora/chirp_stack.go @@ -64,7 +64,7 @@ func (c *ChirpStackTransport) Send(address string, payload []byte) (*transport.S // - WithQueueItemDevEui 指定目标设备的 EUI。 // - WithBody 设置请求体。 params := device_service.NewDeviceServiceEnqueueParams(). - WithTimeout(5 * time.Second). // TODO 这里应该从配置文件里读 + WithTimeout(time.Duration(c.config.APITimeout) * time.Second). WithQueueItemDevEui(address). WithBody(body)