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
---
cameraApi.go | 113 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 91 insertions(+), 22 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 89212af..e68f324 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -7,10 +7,26 @@
"strconv"
)
-type CameraApi struct{}
+type CameraApi struct{
+ Ip string
+ Port int
+}
+
+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 := BASIC_URL + DATA_URL_PREFIX + "/camera/add"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/add"
client := NewClient()
body, err := client.DoPostRequest(url,CONTENT_TYPE_JSON,paramBody,nil,nil)
if err != nil {
@@ -25,7 +41,7 @@
}
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 {
@@ -40,7 +56,7 @@
}
func (api CameraApi) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateSnapshot"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateSnapshot"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["snapshot"] = snapshot
@@ -60,7 +76,7 @@
}
func (api CameraApi) CameraDelete(cid string) bool {
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/del/"+cid
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/del/"+cid
client := NewClient()
paramMap := make(map[string]string,0)
paramMap["cid"] = cid
@@ -78,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)
@@ -98,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)
@@ -118,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)
@@ -141,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 {
@@ -158,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
@@ -176,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)
@@ -197,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
@@ -215,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 {
@@ -232,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
@@ -250,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 {
@@ -269,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
@@ -287,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
@@ -307,9 +342,9 @@
//鏍规嵁杩愯绫诲瀷鑾峰彇鎽勫儚鏈哄垪琛�
//runType(0:鑾峰彇杞鍒楄〃锛�1锛氳幏鍙栧疄鏃跺垪琛�)
func (api CameraApi) GetCamerasByRunType(runType int,cameraName string)(flag bool,cameras []protomsg.Camera){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/getCamerasByRunType"
+ 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)
@@ -334,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
@@ -354,7 +389,7 @@
}
func (api CameraApi) UpdateIsRunningState(cameraId string,isRunning bool) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/updateIsRunningState"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateIsRunningState"
client := NewClient()
paramBody :=make(map[string]interface{},0)
paramBody["cameraId"] = cameraId
@@ -375,7 +410,7 @@
//鎵归噺鍒囨崲鎽勫儚鏈鸿疆璇㈡垨瀹炴椂鐘舵��
func (api CameraApi) ChangeRunType(paramBody map[string]interface{}) (bool,interface{}){
- url := BASIC_URL + DATA_URL_PREFIX + "/camera/changeRunType"
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/changeRunType"
client := NewClient()
body,err := client.DoPostRequest(url,CONTENT_TYPE_JSON, paramBody,nil,nil)
if err != nil {
@@ -389,4 +424,38 @@
}
return res.Success,res.Data
+}
+
+func (api CameraApi) StatisticRunInfo() (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/statisticRunInfo"
+ client := NewClient()
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+ return true,res.Data
+}
+
+func (api CameraApi) FindAllCameraLink() (b bool,list []protomsg.CameraLink){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/findAllCameraLink"
+ client := NewClient()
+ body, err := client.DoGetRequest(url, nil, nil)
+ if err != nil {
+ return false,nil
+ }
+
+ var res Result
+ if err = json.Unmarshal(body, &res); err != nil {
+ return false,nil
+ }
+ dataBytes, _ := json.Marshal(res.Data)
+ if err := json.Unmarshal(dataBytes, &list);err !=nil {
+ return false,nil
+ }
+ return true,list
}
\ No newline at end of file
--
Gitblit v1.8.0