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_plc.go | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/service/device_plc.go b/service/device_plc.go
index fc5fadc..a643653 100644
--- a/service/device_plc.go
+++ b/service/device_plc.go
@@ -19,36 +19,41 @@
}
func (slf DevicePlcService) GetDevicePlc() (*model.DevicePlc, int) {
- DevicePlc, err := model.NewDevicePlcSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
+ devicePlc, err := model.NewDevicePlcSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
if err == gorm.ErrRecordNotFound {
+ logx.Errorf("GetDevicePlc failed:%v", err)
return &model.DevicePlc{
+ DeviceID: "",
Brand: "",
Method: "",
Address: "",
Port: 0,
BaudRate: 0,
SerialName: "",
+ DataBit: 0,
+ StopBit: 0,
+ Parity: 0,
IsOpen: false,
- Detail: "",
Details: make([]*model.DevicePlcAddress, 0),
}, ecode.OK
}
if err != nil {
+ 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 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return 0, errors.New("娌℃湁鎵惧埌褰撳墠璁惧")
}
- if len(plcConfig.Details) == 0 {
- return 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- }
- return len(plcConfig.Details) / 2, nil
+ return device.ExtChannelAmount + 1, nil
}
func (DevicePlcService) UpdateDevicePlc(plc *request.UpdatePlc) int {
@@ -64,11 +69,10 @@
return ecode.ParamsErr
}
record.Detail = string(detail)
-
- if plc.Id == 0 {
+ if record.ID == 0 {
err = model.NewDevicePlcSearch().Create(&record)
} else {
- err = model.NewDevicePlcSearch().SetId(plc.Id).Save(&record)
+ err = model.NewDevicePlcSearch().Save(&record)
}
if err != nil {
--
Gitblit v1.8.0