From 1152ed6c0dd453155ac71c87353d641d59c72a17 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 23 九月 2019 19:57:09 +0800
Subject: [PATCH] fix url
---
taskApi.go | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/taskApi.go b/taskApi.go
index 136577b..46d2020 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -1,7 +1,7 @@
package dbapi
import (
- "analyweb/protomsg"
+ "basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
)
@@ -27,8 +27,35 @@
return taskInfos
}
+func (api TaskApi) FindAllTaskSdkRun() (taskSdks []protomsg.TaskSdkRun) {
+ taskInfos := api.FindAll()
+ if taskInfos !=nil {
+ for _,ti :=range taskInfos{
+ if !ti.Task.Enable {
+ continue
+ }
+ tsr := protomsg.TaskSdkRun{
+ Task:ti.Task,
+ }
+ m := make(map[string]string,0)
+ for _,s := range ti.Sdks{
+ if _,ok :=m[s.IpcId];!ok{
+ m[s.IpcId] = s.IpcId
+ tsr.Sdks = append(tsr.Sdks,&protomsg.SdkRun{
+ IpcId:s.IpcId,
+ SdkType:s.SdkType,
+ })
+ }
+ }
+
+ taskSdks = append(taskSdks,tsr)
+ }
+ }
+ return taskSdks
+}
+
func (api TaskApi) Add(paramBody map[string]interface{}) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/add"
+ url := BASIC_URL + DATA_URL_PREFIX + "/task/addTask"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
@@ -58,13 +85,10 @@
return res.Success,res.Data
}
-func (api TaskApi) AddTaskSdk(taskId string,sdkId string) (bool,interface{}) {
+func (api TaskApi) AddTaskSdk(paramBody map[string]interface{}) (bool,interface{}) {
url := BASIC_URL + DATA_URL_PREFIX + "/task/addTaskSdk"
client := NewClient()
- paramQuery :=make(map[string]string,0)
- paramQuery["taskId"] = taskId
- paramQuery["sdkId"] = sdkId
- respBody, err := client.DoGetRequest(url, paramQuery, nil)
+ respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody, nil,nil)
if err != nil {
return false,nil
}
@@ -75,10 +99,27 @@
return res.Success,res.Data
}
-func (api TaskApi) UpdateTaskStatus(paramBody map[string]string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/addTaskSdk"
+func (api TaskApi) UpdateTaskName(taskId string, taskName string) bool {
+ url := BASIC_URL + DATA_URL_PREFIX + "/task/updateTaskName"
client := NewClient()
- respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, nil,paramBody, nil)
+ paramBody := make(map[string]interface{},0)
+ paramBody["taskId"] = taskId
+ paramBody["taskName"] = taskName
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_FORM, paramBody, nil, nil)
+ if err != nil {
+ return false
+ }
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ return false
+ }
+ return res.Success
+}
+
+func (api TaskApi) UpdateTaskStatus(paramBody map[string]interface{}) (bool,interface{}) {
+ url := BASIC_URL + DATA_URL_PREFIX + "/task/updateTaskStatus"
+ client := NewClient()
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
return false,nil
}
--
Gitblit v1.8.0