From b1114569135bbcbab8a095ebe37f4800183d2c5f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 09 四月 2024 10:17:57 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 5f348a8..53a2bce 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -245,8 +245,8 @@
return
}
- service.TaskFlagUnset(conf.Conf.CurrentDeviceID, procedure.Channel)
- service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagUnset(procedure.DeviceID, procedure.Channel)
+ service.TaskEndTimeSet(procedure.DeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -350,9 +350,9 @@
return
}
- service.TaskFlagSet(conf.Conf.CurrentDeviceID, procedure.Channel, int(procedure.ID))
- service.TaskStartTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
- service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagSet(procedure.DeviceID, procedure.Channel, int(procedure.ID))
+ service.TaskStartTimeSet(procedure.DeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+ service.TaskEndTimeSet(procedure.DeviceID, procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -430,7 +430,9 @@
logx.Errorf("miss param address, k:%v, v:%v", k, v)
continue
}
- err := service.PlcWriteDirect(plcConfig, address, v)
+ err := service.PlcWriteDirect(plcConfig, v, &model.DevicePlcAddress{
+ StartAddress: address,
+ })
if err != nil {
plcConfig.CurrentErr = err
failedNumbers++
--
Gitblit v1.8.0