From 71b0e418839dda386043fb6cad1ec335bcdc06c6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 09 十一月 2023 14:08:21 +0800
Subject: [PATCH] 增加设置是否跳过设置工艺参数接口
---
service/process_model.go | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/service/process_model.go b/service/process_model.go
index bb42646..1922fce 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -3,10 +3,12 @@
import (
"apsClient/conf"
"apsClient/model"
+ "apsClient/pkg/logx"
+ "errors"
)
func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
- device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
if err != nil {
return
}
@@ -19,3 +21,19 @@
func GetProcessModelByNumber(num string) (record *model.ProcessModel, err error) {
return model.NewProcessModelSearch().SetNumber(num).First()
}
+
+func GetProcessModelAddress(deviceID string) (addressMap map[string]int, err error) {
+ record, err := model.NewProcessModelPlcAddressSearch().SetDeviceID(deviceID).First()
+ if err != nil {
+ logx.Errorf("find process model plc address for device:%v, err:%v", deviceID, err)
+ return nil, err
+ }
+ if record.AddressList == nil {
+ return nil, errors.New("empty process model address list")
+ }
+ addressMap = make(map[string]int, len(record.AddressList))
+ for _, item := range record.AddressList {
+ addressMap[item.Name] = item.Address
+ }
+ return addressMap, nil
+}
--
Gitblit v1.8.0