From 5a9e2e97e78a05209a57a75a75678d67c32c58d5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 11:25:20 +0800
Subject: [PATCH] debug over
---
service/device_plc.go | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/service/device_plc.go b/service/device_plc.go
index 2cac8b6..fc5fadc 100644
--- a/service/device_plc.go
+++ b/service/device_plc.go
@@ -1,6 +1,7 @@
package service
import (
+ "apsClient/conf"
"apsClient/model"
"apsClient/model/request"
"apsClient/pkg/ecode"
@@ -8,7 +9,7 @@
"apsClient/pkg/structx"
"encoding/json"
"errors"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
)
type DevicePlcService struct{}
@@ -18,10 +19,9 @@
}
func (slf DevicePlcService) GetDevicePlc() (*model.DevicePlc, int) {
- DevicePlc, err := model.NewDevicePlcSearch().SetOrder("id desc").First()
+ DevicePlc, err := model.NewDevicePlcSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
if err == gorm.ErrRecordNotFound {
return &model.DevicePlc{
- Id: 0,
Brand: "",
Method: "",
Address: "",
@@ -42,11 +42,11 @@
func (slf DevicePlcService) GetDeviceChannelAmount() (int, error) {
plcConfig, code := slf.GetDevicePlc()
- if code != ecode.OK || plcConfig.Id == 0 {
- return 0, errors.New("璇峰厛閰嶇疆PLC")
+ if code != ecode.OK || plcConfig.ID == 0 {
+ return 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
}
if len(plcConfig.Details) == 0 {
- return 0, errors.New("璇峰厛閰嶇疆PLC")
+ return 0, errors.New("鏈幏鍙栧埌PLC鍦板潃锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
}
return len(plcConfig.Details) / 2, nil
}
--
Gitblit v1.8.0