From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
service/device.go | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/service/device.go b/service/device.go
index c81500b..1906d99 100644
--- a/service/device.go
+++ b/service/device.go
@@ -2,6 +2,7 @@
import (
"apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
"apsClient/model/response"
"apsClient/pkg/logx"
@@ -37,14 +38,15 @@
deviceList = make([]*response.Device, 0, len(devices))
for _, device := range devices {
deviceList = append(deviceList, &response.Device{
- DeviceID: device.DeviceID,
- DeviceName: device.DeviceName,
+ DeviceID: device.DeviceID,
+ DeviceName: device.DeviceName,
+ NeedSetProcessParams: device.NeedSetProcessParams,
})
}
return deviceList, nil
}
-func InitCurrentDeviceID() (err error) {
+func InitCurrentDeviceID(ServerID string) (err error) {
currentDeviceID := ReadDeviceIDFromFile()
if currentDeviceID != "" {
conf.Conf.CurrentDeviceID = currentDeviceID
@@ -54,10 +56,12 @@
if err != nil {
return err
}
- if len(deviceList) == 0 {
+ if len(deviceList) > 0 {
+ conf.Conf.CurrentDeviceID = deviceList[0]
+ } else if conf.Conf.System.DeviceId != "" {
conf.Conf.CurrentDeviceID = conf.Conf.System.DeviceId
} else {
- conf.Conf.CurrentDeviceID = deviceList[0]
+ conf.Conf.CurrentDeviceID = ServerID
}
SetDeviceIDToFile(conf.Conf.CurrentDeviceID)
return nil
@@ -92,5 +96,27 @@
return errors.New("璁惧涓嶅瓨鍦�")
}
device.NeedSetProcessParams = needSetProcessParams
- return model.NewDeviceSearch().SetID(device.ID).Save(device)
+ return model.NewDeviceSearch().SetID(device.ID).UpdateByMap(map[string]interface{}{"need_set_process_params": needSetProcessParams})
+}
+
+func GetCurrentDevice() (device *model.Device, err error) {
+ if conf.Conf.CurrentDeviceID == "" {
+ return nil, errors.New("褰撳墠璁惧ID涓嶅瓨鍦紝璇锋鏌�")
+ }
+ device, err = model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err == gorm.ErrRecordNotFound {
+ return nil, errors.New("璁惧涓嶅瓨鍦�")
+ }
+ return device, nil
+}
+
+// ReportsSystemDeviceToCloud 鍒涘缓鍚屾璁惧id璁板綍
+func ReportsSystemDeviceToCloud(systemDeviceID string) {
+ err := model.NewReportsToCloudSearch(nil).Create(&model.ReportsToCloud{
+ ReportType: constvar.ReportTypeSystemDeviceID,
+ Content: systemDeviceID,
+ })
+ if err != nil {
+ logx.Errorf("ReportsSystemDeviceToCloud create record error:%v", err)
+ }
}
--
Gitblit v1.8.0