From c00336905aa4a7c55def3a3bcb121bd35a0fd9fc Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sat, 20 Oct 2018 09:35:17 +0800
Subject: [PATCH] - ren tasksch.Task to ParallelTask.

---
 business/jxutils/tasksch/parallel_task.go | 12 ++++++------
 business/jxutils/tasksch/task_man.go      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/jxutils/tasksch/parallel_task.go b/business/jxutils/tasksch/parallel_task.go
index e2235bee3..c59055fe3 100644
--- a/business/jxutils/tasksch/parallel_task.go
+++ b/business/jxutils/tasksch/parallel_task.go
@@ -24,7 +24,7 @@ type ParallelConfig struct {
 	ResultHandler       ResultHandlerFunc
 }
 
-type Task struct {
+type ParallelTask struct {
 	BaseTask
 
 	resultHandler ResultHandlerFunc
@@ -68,7 +68,7 @@ func (c *ParallelConfig) SetResultHandler(resultHandler ResultHandlerFunc) *Para
 	return c
 }
 
-func NewParallelTask(taskName string, userName string, config *ParallelConfig, worker WorkFunc, itemList interface{}, params ...interface{}) *Task {
+func NewParallelTask(taskName string, userName string, config *ParallelConfig, worker WorkFunc, itemList interface{}, params ...interface{}) *ParallelTask {
 	if config == nil {
 		config = NewParallelConfig()
 	}
@@ -84,7 +84,7 @@ func NewParallelTask(taskName string, userName string, config *ParallelConfig, w
 	if config.ParallelCount > jobListLen {
 		config.ParallelCount = jobListLen
 	}
-	task := &Task{
+	task := &ParallelTask{
 		subFinishChan: make(chan interface{}, config.ParallelCount),
 		taskChan:      make(chan []interface{}, len(realItemList)+config.ParallelCount), // 确保能装下所有taskitem，加结束标记
 		resultHandler: config.ResultHandler,
@@ -95,13 +95,13 @@ func NewParallelTask(taskName string, userName string, config *ParallelConfig, w
 	return task
 }
 
-func RunParallelTask(taskName string, userName string, config *ParallelConfig, worker WorkFunc, itemList interface{}, params ...interface{}) *Task {
+func RunParallelTask(taskName string, userName string, config *ParallelConfig, worker WorkFunc, itemList interface{}, params ...interface{}) *ParallelTask {
 	task := NewParallelTask(taskName, userName, config, worker, itemList, params...)
 	task.Run()
 	return task
 }
 
-func RunTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *Task {
+func RunTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *ParallelTask {
 	config := NewParallelConfig()
 	config.BatchSize = batchSize
 	config.IsContinueWhenError = isContinueWhenError
@@ -112,7 +112,7 @@ func RunTask(taskName string, isContinueWhenError bool, resultHandler ResultHand
 	return task
 }
 
-func (task *Task) Run() {
+func (task *ParallelTask) Run() {
 	task.run(func() {
 		globals.SugarLogger.Debugf("ParallelTask.Run %s", task.Name)
 		for i := 0; i < task.ParallelCount; i++ {
diff --git a/business/jxutils/tasksch/task_man.go b/business/jxutils/tasksch/task_man.go
index 22365f893..190141cff 100644
--- a/business/jxutils/tasksch/task_man.go
+++ b/business/jxutils/tasksch/task_man.go
@@ -18,7 +18,7 @@ func init() {
 	defTaskMan.taskList = make(map[string]ITask)
 }
 
-func (m *TaskMan) RunTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *Task {
+func (m *TaskMan) RunTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *ParallelTask {
 	task := RunTask(taskName, isContinueWhenError, resultHandler, parallelCount, batchSize, userName, worker, itemList, params...)
 	m.taskList[task.ID] = task
 	return task
@@ -39,7 +39,7 @@ func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours in
 	return taskList
 }
 
-func RunManagedTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *Task {
+func RunManagedTask(taskName string, isContinueWhenError bool, resultHandler ResultHandlerFunc, parallelCount, batchSize int, userName string, worker WorkFunc, itemList interface{}, params ...interface{}) *ParallelTask {
 	return defTaskMan.RunTask(taskName, isContinueWhenError, resultHandler, parallelCount, batchSize, userName, worker, itemList, params...)
 }