From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 25 四月 2024 10:02:01 +0800
Subject: [PATCH] 更改定时任务时区设置

---
 api/v1/task.go |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 5f348a8..6e3c295 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -105,13 +105,12 @@
 		return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
 	})
 
-	nowTs := time.Now().Unix()
 	flagMap := make(map[int32]struct{}, 0)
 	for _, task := range taskResponse.Tasks {
 		if task.Procedure.Status != model.ProcedureStatusWaitProcess {
 			continue
 		}
-		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
+		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) {
 			task.CanStarted = true
 			flagMap[task.Channel] = struct{}{}
 		}
@@ -245,8 +244,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 +349,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 +429,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++
@@ -508,10 +509,9 @@
 		return
 	}
 
-	nowTs := time.Now().Unix()
 	flagMap := make(map[int32]struct{}, 0)
 	for _, task := range taskResponse.Tasks {
-		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
+		if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) {
 			task.CanStarted = true
 			flagMap[task.Channel] = struct{}{}
 		}

--
Gitblit v1.8.0