From 288d78f66ecd1b628e8d1df7a3da99fc5e6880ec Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 08 十二月 2023 14:13:37 +0800
Subject: [PATCH] debug
---
service/device_plc.go | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/service/device_plc.go b/service/device_plc.go
index ecff338..a643653 100644
--- a/service/device_plc.go
+++ b/service/device_plc.go
@@ -8,6 +8,7 @@
"apsClient/pkg/logx"
"apsClient/pkg/structx"
"encoding/json"
+ "errors"
"github.com/jinzhu/gorm"
)
@@ -18,7 +19,7 @@
}
func (slf DevicePlcService) GetDevicePlc() (*model.DevicePlc, int) {
- DevicePlc, err := model.NewDevicePlcSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ devicePlc, err := model.NewDevicePlcSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
if err == gorm.ErrRecordNotFound {
logx.Errorf("GetDevicePlc failed:%v", err)
return &model.DevicePlc{
@@ -40,19 +41,19 @@
logx.Errorf("GetDevicePlc failed:%v", err)
return nil, ecode.DBErr
}
+ if len(devicePlc.Details) == 0 {
+ return nil, ecode.PlcAddressError
+ }
- return DevicePlc, ecode.OK
+ return devicePlc, ecode.OK
}
func (slf DevicePlcService) GetDeviceChannelAmount() (int, error) {
- plcConfig, code := slf.GetDevicePlc()
- if code != ecode.OK || plcConfig.ID == 0 {
- return 1, nil
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return 0, errors.New("娌℃湁鎵惧埌褰撳墠璁惧")
}
- if len(plcConfig.Details) == 0 {
- return 1, nil
- }
- return len(plcConfig.Details) / 2, nil
+ return device.ExtChannelAmount + 1, nil
}
func (DevicePlcService) UpdateDevicePlc(plc *request.UpdatePlc) int {
--
Gitblit v1.8.0