From d8d991f239fb5e2fcb8ca134da6feb1758f6dade Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 19 十月 2019 19:43:27 +0800
Subject: [PATCH] add ip config
---
cameraApi.go | 128 +++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 27 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 841b3b8..a4d2311 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -7,25 +7,41 @@
"strconv"
)
-type CameraApi struct{}
+type CameraApi struct{
+ Ip string
+ Port int
+}
-func (api CameraApi) CameraAdd(paramBody map[string]interface{}) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/add"
+func (api CameraApi) 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 CameraApi) CameraAdd(paramBody map[string]interface{}) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/add"
client := NewClient()
body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
if err != nil {
- return false
+ return false,nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false
+ return false,nil
}
- return res.Success
+ return res.Success,res.Data
}
func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/update"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/update"
client := NewClient()
body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
if err != nil {
@@ -39,8 +55,28 @@
return res.Success
}
+func (api CameraApi) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateSnapshot"
+ client := NewClient()
+ paramBody :=make(map[string]interface{},0)
+ paramBody["snapshot"] = snapshot
+ paramBody["cameraId"] = cameraId
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
+ if err != nil {
+ return false
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false
+ }
+
+ return res.Success
+}
+
func (api CameraApi) CameraDelete(cid string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/delete/"+cid
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/del/"+cid
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
@@ -58,7 +94,7 @@
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
func (api CameraApi) GetCameraById(cameraId string) (camera protomsg.Camera, err error) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/show/" + cameraId
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/show/" + cameraId
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -78,7 +114,7 @@
}
func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/showAll"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/showAll"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -98,9 +134,28 @@
return cameras
}
+func (api CameraApi) GetAllCamerasByServer(serverId string,cameraName string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getAllCamerasByServer"
+ client := NewClient()
+ paramQuery := make(map[string]string,0)
+ paramQuery["serverId"] = serverId
+ paramQuery["cameraName"] = cameraName
+ body, err := client.DoGetRequest(url, paramQuery, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -121,7 +176,7 @@
}
func (api CameraApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/save"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/save"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -138,7 +193,7 @@
}
func (api CameraApi) DeleteCameraPolygon(id string) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/delete"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/delete"
client := NewClient()
paramQuery := make(map[string]string,0)
paramQuery["id"]=id
@@ -156,7 +211,7 @@
func (api CameraApi) FindAllPolygons() ([]protomsg.CameraPolygon) {
polygons := make([]protomsg.CameraPolygon,0)
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/findAll"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/findAll"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
@@ -177,7 +232,7 @@
}
func (api CameraApi) FindPolygonsByCameraId(cameraId string) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/findByCameraId"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/findByCameraId"
client := NewClient()
paramQuery := make(map[string]string,0)
paramQuery["cameraId"] = cameraId
@@ -195,7 +250,7 @@
//鏂板鎴栨洿鏂版椂闂磋鍒�
func (api CameraApi) SaveCameraTimerule(paramBody map[string]interface{}) (bool,interface{}) {
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/save"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTimerule/save"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -212,7 +267,7 @@
}
func (api CameraApi) DeleteCameraTimerule (id string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/delete"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTimerule/delete"
client := NewClient()
paramQuery := make(map[string]string,0)
paramQuery["id"]=id
@@ -230,7 +285,7 @@
//鏍规嵁鎽勫儚鏈篿d鏌ユ壘鎵�鏈夌殑鏃堕棿瑙勫垯
func (api CameraApi) FindAllTimeRules() (flag bool,rules []protomsg.CameraTimerule) {
- url := BASIC_URL + DATA_URL_PREFIX + "/cameraTimerule/findAll"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/cameraTimerule/findAll"
client := NewClient()
body, err := client.DoGetRequest(url, nil, nil)
if err != nil {
@@ -249,7 +304,7 @@
}
func (api CameraApi) UpdateDefenceStateByPolygonId(polygonId string,state string) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/updateDefenceStateByPolygonId"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/updateDefenceStateByPolygonId"
client := NewClient()
paramQuery :=make(map[string]string,0)
paramQuery["polygonId"] = polygonId
@@ -267,7 +322,7 @@
}
func (api CameraApi) UpdateDefenceStateByCameraId(cameraId string,state string) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/polygon/updateDefenceStateByCameraId"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/updateDefenceStateByCameraId"
client := NewClient()
paramQuery :=make(map[string]string,0)
paramQuery["cameraId"] = cameraId
@@ -286,11 +341,12 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
-func (api CameraApi) GetCamerasByRunType(runType int)(flag bool,cameras []protomsg.Camera){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/getCamerasByRunType"
+func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/getCamerasByRunType"
client := NewClient()
- paramQuery := make(map[string]string,0)
+ paramQuery := make(map[string]string,2)
paramQuery["runType"]=strconv.Itoa(runType)
+ paramQuery["cameraName"] = cameraName
body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
return false,nil
@@ -313,7 +369,7 @@
}
func (api CameraApi) UpdateRunEnable(cameraId string,runEnable bool) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateRunEnable"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateRunEnable"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["cameraId"] = cameraId
@@ -332,12 +388,12 @@
return res.Success,res.Data
}
-func (api CameraApi) ChangeRunType(cameraId string,runType int) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/changeRunType"
+func (api CameraApi) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateIsRunningState"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["cameraId"] = cameraId
- paramBody["runType"] = runType
+ paramBody["isRunning"] = isRunning
body,err := client.DoPostRequest(url,CONTENT_TYPE_FORM, paramBody,nil,nil)
if err != nil {
return false,nil
@@ -350,4 +406,22 @@
}
return res.Success,res.Data
+}
+
+//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
+func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/changeRunType"
+ client := NewClient()
+ body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ fmt.Println(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0