liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- createdBy params added for GetTasks

Browse Source
This commit is contained in:
gazebo
2019-03-06 11:15:18 +08:00
parent acfd902071
commit 887eeafa9f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/jxutils/tasksch/task_man.go
View File

@@ -20,7 +20,7 @@ func init() {
defTaskMan.taskList = make(map[string]ITask) defTaskMan.taskList = make(map[string]ITask)
} }
func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours int) (taskList TaskList) { func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours int, createdBy string) (taskList TaskList) {
m.locker.RLock() m.locker.RLock()
defer m.locker.RUnlock() defer m.locker.RUnlock()
if lastHours == 0 { if lastHours == 0 {
@@ -29,7 +29,7 @@ func (m *TaskMan) GetTasks(taskID string, fromStatus, toStatus int, lastHours in
lastTime := time.Now().Add(time.Duration(-lastHours) * time.Hour).Unix() lastTime := time.Now().Add(time.Duration(-lastHours) * time.Hour).Unix()
for k, v := range m.taskList { for k, v := range m.taskList {
status := v.GetStatus() status := v.GetStatus()
if !((taskID != "" && taskID != k) || status < fromStatus || status > toStatus || v.GetCreatedAt().Unix() < lastTime) { if !((createdBy != "" && createdBy != v.GetCreatedBy()) || (taskID != "" && taskID != k) || status < fromStatus || status > toStatus || v.GetCreatedAt().Unix() < lastTime) {
taskList = append(taskList, v) taskList = append(taskList, v)
} }
} }
@@ -44,8 +44,8 @@ func (m *TaskMan) ManageTask(task ITask) ITask {
return task return task
} }
func GetTasks(taskID string, fromStatus, toStatus int, lastHours int) (taskList TaskList) { func GetTasks(taskID string, fromStatus, toStatus int, lastHours int, createdBy string) (taskList TaskList) {
return defTaskMan.GetTasks(taskID, fromStatus, toStatus, lastHours) return defTaskMan.GetTasks(taskID, fromStatus, toStatus, lastHours, createdBy)
} }
func ManageTask(task ITask) ITask { func ManageTask(task ITask) ITask {

5
controllers/cms_task.go
View File

@@ -18,6 +18,7 @@ type TaskController struct {
// @Param fromStatus query int false "起始状态" // @Param fromStatus query int false "起始状态"
// @Param toStatus query int false "结束状态" // @Param toStatus query int false "结束状态"
// @Param lastHours query int false "多少小时以内的" // @Param lastHours query int false "多少小时以内的"
// @Param createdBy query string false "创建人"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /GetTasks [get] // @router /GetTasks [get]
@@ -31,7 +32,7 @@ func (c *TaskController) GetTasks() {
} else if params.MapData["toStatus"] == nil { } else if params.MapData["toStatus"] == nil {
params.ToStatus = params.FromStatus params.ToStatus = params.FromStatus
} }
retVal = tasksch.GetTasks(params.TaskID, params.FromStatus, params.ToStatus, params.LastHours) retVal = tasksch.GetTasks(params.TaskID, params.FromStatus, params.ToStatus, params.LastHours, params.CreatedBy)
return retVal, "", err return retVal, "", err
}) })
} }
@@ -45,7 +46,7 @@ func (c *TaskController) GetTasks() {
// @router /CancelTask [put] // @router /CancelTask [put]
func (c *TaskController) CancelTask() { func (c *TaskController) CancelTask() {
c.callCancelTask(func(params *tTaskCancelTaskParams) (retVal interface{}, errCode string, err error) { c.callCancelTask(func(params *tTaskCancelTaskParams) (retVal interface{}, errCode string, err error) {
tasks := tasksch.GetTasks(params.TaskID, tasksch.TaskStatusBegin, tasksch.TaskStatusEnd, 3*24) tasks := tasksch.GetTasks(params.TaskID, tasksch.TaskStatusBegin, tasksch.TaskStatusEnd, 3*24, "")
if len(tasks) != 1 { if len(tasks) != 1 {
return nil, "", fmt.Errorf("taskID:%s,找不到或找到不仅一个任务", params.TaskID) return nil, "", fmt.Errorf("taskID:%s,找不到或找到不仅一个任务", params.TaskID)
} }