From 78687a8f42290a1f5755027473f146300188196b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 14 十二月 2019 18:13:08 +0800
Subject: [PATCH] add arg
---
cameraTaskApi.go | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/cameraTaskApi.go b/cameraTaskApi.go
index 8e44d94..20cdf3d 100644
--- a/cameraTaskApi.go
+++ b/cameraTaskApi.go
@@ -2,14 +2,29 @@
import (
"encoding/json"
+ "strconv"
)
type CameraTaskApi struct {
+ Ip string
+ Port int
+}
+func (api CameraTaskApi) 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 CameraTaskApi) AddTask(cameraId string,taskId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTask/addTask"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/addTask"
client := NewClient()
paramBody := map[string]interface{}{
"cameraId": cameraId,
@@ -27,7 +42,7 @@
}
func (api CameraTaskApi) CameraTaskSave(paramBody map[string]interface{}) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/saveTask"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/saveTask"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
if err != nil {
@@ -41,7 +56,7 @@
}
func (api CameraTaskApi) FindTasksByCameraIds(cameraIds []string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/alltask"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/alltask"
client := NewClient()
paramBody :=make(map[string]interface{})
paramBody["cameraIds"] = cameraIds
@@ -57,7 +72,7 @@
}
func (api CameraTaskApi) CameraTaskAll(cameraId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/task/"+cameraId
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/task/"+cameraId
client := NewClient()
paramQuery :=make(map[string]string)
paramQuery["cameraId"] = cameraId
@@ -73,7 +88,7 @@
}
func (api CameraTaskApi) DeleteCameraTask(cameraId string,taskId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/delTask/"+cameraId+"/"+taskId
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/delTask/"+cameraId+"/"+taskId
client := NewClient()
respBody, err := client.DoDeleteRequest(url, CONTENT_TYPE_FORM, nil,nil)
if err != nil {
@@ -87,7 +102,7 @@
}
func (api CameraTaskApi) SaveIsDataTrans(paramBody map[string]interface{}) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTask/saveIsDataTrans"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveIsDataTrans"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
if err != nil {
@@ -101,7 +116,7 @@
}
func (api CameraTaskApi) SaveAlarmLevelByGroup(groupId string,alarmLevel int) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTask/saveAlarmLevelByGroup"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/saveAlarmLevelByGroup"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["group_id"] = groupId
@@ -119,7 +134,7 @@
//鏇存柊鎽勫儚鏈轰换鍔＄姸鎬�
func (api CameraTaskApi) UpdateCameraTaskStatus(cameraId string,taskId string,statusInt int) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTask/updateCameraTaskStatus"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTask/updateCameraTaskStatus"
client := NewClient()
paramBody :=make(map[string]interface{})
paramBody["cameraId"] = cameraId
--
Gitblit v1.8.0