From bfef804862d9a8bbf2df9cb6f758bfc39eb8cdd7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 07 十一月 2023 09:49:14 +0800
Subject: [PATCH] 设备信息增加设备名称字段

---
 api/v1/task.go |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 0b1c769..553b76d 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -10,7 +10,6 @@
 	"apsClient/pkg/ecode"
 	"apsClient/pkg/logx"
 	"apsClient/service"
-	"apsClient/service/plc_address"
 	"errors"
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/gorm"
@@ -392,8 +391,12 @@
 		logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
 	}
 	var failedNumbers int
+	processModelAddress, err := service.GetProcessModelAddress(conf.Conf.CurrentDeviceID)
+	if err != nil {
+		return err
+	}
 	for k, v := range paramsMap {
-		address, ok := plc_address.Get(k)
+		address, ok := processModelAddress[k]
 		if !ok {
 			logx.Errorf("miss param address, k:%v, v:%v", k, v)
 			continue

--
Gitblit v1.8.0