From 14fc2f577e2c0b7b146c1a430e9438f317ad5b0c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 23 九月 2023 14:14:27 +0800
Subject: [PATCH] 任务接收增加channel字段,postion字段改为channel

---
 service/task.go |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/task.go b/service/task.go
index df0002e..30f5a3c 100644
--- a/service/task.go
+++ b/service/task.go
@@ -91,7 +91,7 @@
 			Procedure:             procedure,
 			AllProcedures:         procedure.ProceduresInfo.AllProcedureNames,
 			CurrentProcedureIndex: 0,
-			Position:              procedure.Position,
+			Channel:               procedure.Channel,
 		}
 		index := 0
 		for _, name := range procedure.ProceduresInfo.AllProcedureNames {
@@ -132,19 +132,19 @@
 	return procedure, ecode.OK
 }
 
-func (slf TaskService) UpdateProcedureStatusAndPosition(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
 	if status == model.ProcedureStatusFinished {
-		ProgressCacheUnset(position)
+		ProgressCacheUnset(channel)
 	}
 	return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
-		"status":   status,
-		"position": position,
+		"status":  status,
+		"channel": channel,
 	})
 }
 
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
 	if status == model.ProcedureStatusFinished {
-		ProgressCacheUnset(position)
+		ProgressCacheUnset(channel)
 	}
 	return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
 		"status": status,

--
Gitblit v1.8.0