From d7b9b37faab9efee51737ee718da74b9bca4fa1b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 08 十一月 2023 15:24:23 +0800
Subject: [PATCH] debug
---
service/device.go | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/service/device.go b/service/device.go
index 29f2784..e11b959 100644
--- a/service/device.go
+++ b/service/device.go
@@ -3,13 +3,18 @@
import (
"apsClient/conf"
"apsClient/model"
+ "apsClient/model/response"
"apsClient/pkg/logx"
+ "github.com/jinzhu/gorm"
"os"
"strings"
)
func GetDeviceIDList() (deviceIds []string, err error) {
devices, err := model.NewDeviceSearch().SetDeviceMac(conf.Conf.System.DeviceId).FindNotTotal()
+ if err == gorm.ErrRecordNotFound {
+ return nil, nil
+ }
if err != nil {
return nil, err
}
@@ -18,6 +23,24 @@
deviceIds = append(deviceIds, device.DeviceID)
}
return deviceIds, nil
+}
+
+func GetDeviceList() (deviceList []*response.Device, err error) {
+ devices, err := model.NewDeviceSearch().SetDeviceMac(conf.Conf.System.DeviceId).FindNotTotal()
+ if err == gorm.ErrRecordNotFound {
+ return nil, nil
+ }
+ if err != nil {
+ return nil, err
+ }
+ deviceList = make([]*response.Device, 0, len(devices))
+ for _, device := range devices {
+ deviceList = append(deviceList, &response.Device{
+ DeviceID: device.DeviceID,
+ DeviceName: device.DeviceName,
+ })
+ }
+ return deviceList, nil
}
func InitCurrentDeviceID() (err error) {
@@ -32,9 +55,9 @@
}
if len(deviceList) == 0 {
conf.Conf.CurrentDeviceID = conf.Conf.System.DeviceId
- return nil
+ } else {
+ conf.Conf.CurrentDeviceID = deviceList[0]
}
- conf.Conf.CurrentDeviceID = deviceList[0]
SetDeviceIDToFile(conf.Conf.CurrentDeviceID)
return nil
}
--
Gitblit v1.8.0