From 87f105455c788e8804dc154014f1d7936b080771 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 07 十一月 2023 09:57:39 +0800
Subject: [PATCH] 设备列表返回设备名
---
service/device.go | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/service/device.go b/service/device.go
index 8ad1d23..e11b959 100644
--- a/service/device.go
+++ b/service/device.go
@@ -3,6 +3,7 @@
import (
"apsClient/conf"
"apsClient/model"
+ "apsClient/model/response"
"apsClient/pkg/logx"
"github.com/jinzhu/gorm"
"os"
@@ -24,6 +25,24 @@
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) {
currentDeviceID := ReadDeviceIDFromFile()
if currentDeviceID != "" {
--
Gitblit v1.8.0