From 3c1c1467ebc4356a9ad5441d52ab62a431cb3df5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 23 十二月 2019 11:41:01 +0800
Subject: [PATCH] fix ret
---
taskApi.go | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/taskApi.go b/taskApi.go
index 3d4b3ee..51e1d21 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -4,16 +4,53 @@
"basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
+ "strconv"
)
-type TaskApi struct {}
+type TaskApi struct {
+ Ip string
+ Port int
+}
+
+func (api TaskApi) getBasicUrl() string {
+ if api.Ip == "" {
+ return BASIC_URL
+ }
+ if api.Ip == "" {
+ api.Ip = DEFAULT_IP
+ }
+ if api.Port == 0 {
+ api.Port = DEFAULT_PORT
+ }
+ return "http://"+api.Ip+":"+strconv.Itoa(api.Port)
+}
//鑾峰彇鎵�鏈変换鍔′俊鎭�(鍖呭惈绠楁硶瀹氫箟)
func (api TaskApi) FindAll() (taskInfos []protomsg.TaskSdkInfo) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/findAll"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
client := NewClient()
respBody, err := client.DoGetRequest(url, nil, nil)
+ if err !=nil {
+ return taskInfos
+ }
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ fmt.Println(err)
+ return taskInfos
+ }
+ bytes, _ := json.Marshal(res.Data)
+ err = json.Unmarshal(bytes, &taskInfos)
+ return taskInfos
+}
+
+func (api TaskApi) FindAllTaskDefaultArgs(scope string)(taskInfos []protomsg.TaskSdkInfo) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/findAll"
+ client := NewClient()
+ queryParam := map[string]string {
+ "scope": scope,
+ }
+ respBody, err := client.DoGetRequest(url, queryParam, nil)
if err !=nil {
return taskInfos
}
@@ -31,6 +68,9 @@
taskInfos := api.FindAll()
if taskInfos !=nil {
for _,ti :=range taskInfos{
+ if !ti.Task.Enable {
+ continue
+ }
tsr := protomsg.TaskSdkRun{
Task:ti.Task,
}
@@ -52,7 +92,7 @@
}
func (api TaskApi) Add(paramBody map[string]interface{}) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/add"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/addTask"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
@@ -67,7 +107,7 @@
}
func (api TaskApi) Delete(taskId string) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/task/delete"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delete"
client := NewClient()
paramQuery :=make(map[string]string,0)
paramQuery["taskId"] = taskId
@@ -82,13 +122,10 @@
return res.Success,res.Data
}
-func (api TaskApi) AddTaskSdk(taskId string,sdkId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/addTaskSdk"
+func (api TaskApi) AddTaskSdk(paramBody map[string]interface{}) (bool,interface{}) {
+ url := api.getBasicUrl() + 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
}
@@ -97,10 +134,27 @@
return false,nil
}
return res.Success,res.Data
+}
+
+func (api TaskApi) UpdateTaskName(taskId string, taskName string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskName"
+ client := NewClient()
+ 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"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/updateTaskStatus"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody, nil, nil)
if err != nil {
@@ -114,7 +168,7 @@
}
func (api TaskApi) DeleteTaskSdk(taskId string,sdkId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/task/delTaskSdk"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/delTaskSdk"
client := NewClient()
paramQuery :=make(map[string]string,0)
paramQuery["taskId"] = taskId
@@ -128,4 +182,18 @@
return false,nil
}
return res.Success,res.Data
+}
+
+func (api TaskApi) StatisticTaskCamera() (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/task/statisticTaskCamera"
+ client := NewClient()
+ respBody, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false,nil
+ }
+ var res Result
+ if err = json.Unmarshal(respBody, &res); err != nil {
+ return false,nil
+ }
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0