From 53d80c839ad2aad0a0482ca43fca1fc3a95b9d1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 17:30:54 +0800
Subject: [PATCH] 更改路由
---
service/device.go | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/service/device.go b/service/device.go
index f778f25..8ad1d23 100644
--- a/service/device.go
+++ b/service/device.go
@@ -3,12 +3,17 @@
import (
"apsClient/conf"
"apsClient/model"
- "fmt"
+ "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
}
@@ -19,22 +24,44 @@
return deviceIds, nil
}
+func InitCurrentDeviceID() (err error) {
+ currentDeviceID := ReadDeviceIDFromFile()
+ if currentDeviceID != "" {
+ conf.Conf.CurrentDeviceID = currentDeviceID
+ return
+ }
+ deviceList, err := GetDeviceIDList()
+ if err != nil {
+ return err
+ }
+ if len(deviceList) == 0 {
+ conf.Conf.CurrentDeviceID = conf.Conf.System.DeviceId
+ } else {
+ conf.Conf.CurrentDeviceID = deviceList[0]
+ }
+ SetDeviceIDToFile(conf.Conf.CurrentDeviceID)
+ return nil
+}
+
const deviceIDFile = "currentDeviceID.txt"
func SetDeviceIDToFile(deviceID string) {
err := os.WriteFile(deviceIDFile, []byte(deviceID), 0644)
if err != nil {
- fmt.Printf("鏃犳硶鍐欏叆璁惧ID鍒版枃浠�: %v\n", err)
+ logx.Errorf("鏃犳硶鍐欏叆璁惧ID鍒版枃浠�: %v\n", err)
} else {
- fmt.Println("璁惧ID宸插啓鍏ユ枃浠�")
+ logx.Infof("璁惧ID宸插啓鍏ユ枃浠�")
}
}
func ReadDeviceIDFromFile() string {
data, err := os.ReadFile(deviceIDFile)
if err != nil {
- fmt.Printf("鏃犳硶璇诲彇璁惧ID鏂囦欢: %v\n", err)
+ logx.Errorf("鏃犳硶璇诲彇璁惧ID鏂囦欢: %v\n", err)
return ""
}
- return string(data)
+ deviceId := string(data)
+ deviceId = strings.TrimSpace(deviceId)
+ deviceId = strings.Trim(deviceId, "\n")
+ return deviceId
}
--
Gitblit v1.8.0