From 0ce10d63b42524d3e4e4b9a2ea35901048a33eb1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 17:22:37 +0800
Subject: [PATCH] add name filter
---
cameraTaskArgsApi.go | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/cameraTaskArgsApi.go b/cameraTaskArgsApi.go
index e3b0eaf..5321f5e 100644
--- a/cameraTaskArgsApi.go
+++ b/cameraTaskArgsApi.go
@@ -3,14 +3,29 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
+ "strconv"
)
type CameraTaskArgsApi struct {
+ Ip string
+ Port int
+}
+func (api CameraTaskArgsApi) 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 CameraTaskArgsApi) FindByCameraAndTask(cameraId string,taskId string,setType string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/getRulesByCameraAndTask"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getRulesByCameraAndTask"
client := NewClient()
paramQuery :=make(map[string]string)
paramQuery["cameraId"] = cameraId
@@ -28,7 +43,7 @@
}
func (api CameraTaskArgsApi) UpdateDefenceStateByGroup(groupId string,defenceState bool)(bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTaskArgs/updateDefenceStateByGroup"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/updateDefenceStateByGroup"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["groupId"] = groupId
@@ -45,7 +60,7 @@
}
func (api CameraTaskArgsApi) DeleteByGroup(groupId string)(bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTaskArgs/deleteByGroup"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/deleteByGroup"
client := NewClient()
paramQuery :=make(map[string]string)
paramQuery["groupId"] = groupId
@@ -61,7 +76,7 @@
}
func (api CameraTaskArgsApi) FindAll() ([]protomsg.CameraTaskArgs){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTaskArgs/findAll"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/findAll"
client := NewClient()
respBody, err := client.DoGetRequest(url, nil,nil)
if err != nil {
@@ -78,7 +93,7 @@
}
func (api CameraTaskArgsApi) GetLinkRulesByCameraIds(paramBody map[string]interface{})(bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTaskArgs/getLinkRulesByCameraIds"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/getLinkRulesByCameraIds"
client := NewClient()
respBody, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
if err != nil {
@@ -92,7 +107,21 @@
}
func (api CameraTaskArgsApi) SaveLinkRulesByGroup(paramBody map[string]interface{}) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTaskArgs/saveLinkRulesByGroup"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/saveLinkRulesByGroup"
+ client := NewClient()
+ respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,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
+}
+
+func (api CameraTaskApi) RuleApply2All(paramBody map[string]interface{}) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTaskArgs/ruleApply2All"
client := NewClient()
respBody, err := client.DoPostRequest(url, CONTENT_TYPE_JSON, paramBody,nil, nil)
if err != nil {
--
Gitblit v1.8.0