fix
zhangqian
2023-09-27 86511ae2c82d778812ea0cddc4efc08f0712dd07
fix
2个文件已修改
13 ■■■■■ 已修改文件
api/v1/task.go 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/task.go 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
api/v1/task.go
@@ -115,6 +115,7 @@
    taskResponse.Prompt = conf.Conf.Prompt
    taskResponse.ChannelAmount = channelAmount
    taskResponse.TaskCount = service.NewTaskService().NewTaskCount()
    ctx.OkWithDetailed(taskResponse)
}
service/task.go
@@ -106,15 +106,17 @@
        taskList = append(taskList, &taskData)
        workers = append(workers, procedure.ProceduresInfo.Workers...)
    }
    count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
    taskResp = &response.TaskResponse{
        Tasks:     taskList,
        TaskCount: count,
        Workers:   slf.WorkerDistinct(workers),
        Tasks:   taskList,
        Workers: slf.WorkerDistinct(workers),
    }
    return taskResp, ecode.OK
}
func (slf TaskService) NewTaskCount() (count int64) {
    nowTs := time.Now().Unix()
    count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
    return count
}
func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
    exists := make(map[string]bool, 0)