From 02a84fb6fb2a39bfe7fc5cf6c0137bbf231b17fe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 09 十一月 2023 14:14:17 +0800
Subject: [PATCH] 设备列表返回是否设置工艺参数字段
---
api/v1/task.go | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0b1c769..439a8d7 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"
@@ -78,7 +77,7 @@
taskMode = params.TaskMode
}
- taskResponse, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ taskResponse, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
@@ -93,7 +92,7 @@
if existsChannel[int32(i)] {
continue
}
- taskResponseTemp, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+ taskResponseTemp, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
if code != ecode.OK {
ctx.Fail(code)
return
@@ -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