From f529b0fe67d68a4be6e9690043ee5d6837be72df Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 12 一月 2021 11:05:50 +0800
Subject: [PATCH] getAppInfo and voice add
---
cameraApi.go | 186 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 27 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 6c77a00..5321e00 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "fmt"
"strconv"
)
@@ -40,19 +39,19 @@
return res.Success,res.Data
}
-func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) bool {
+func (api CameraApi) CameraUpdate(paramBody map[string]interface{}) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/update"
client := NewClient()
body, err := client.DoPutRequest(url,CONTENT_TYPE_JSON,paramBody,nil)
if err != nil {
- return false
+ return false, err
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- return false
+ return false, err
}
- return res.Success
+ return res.Success, res.Data
}
func (api CameraApi) UpdateSnapshotUrl(cameraId string, snapshot string) bool {
@@ -68,7 +67,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false
}
@@ -113,6 +112,26 @@
return camera, err
}
+func (api CameraApi) UpdateCameraArea(cameraId string, areaId string) bool {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateCameraArea"
+ client := NewClient()
+ paramBody := map[string]interface{} {
+ "cameraId": cameraId,
+ "areaId": areaId,
+ }
+ 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 {
+ return false
+ }
+
+ return res.Success
+}
+
func (api CameraApi) FindAll() (cameras []protomsg.Camera) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/showAll"
client := NewClient()
@@ -124,7 +143,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return nil
}
@@ -153,27 +172,46 @@
return res.Success,res.Data
}
-//鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
-func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
- url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+func (api CameraApi) GetNodeCamera(searchType string,cameraName string) (bool,interface{}) {
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/nodeCamera"
client := NewClient()
-
- body, err := client.DoGetRequest(url, nil, nil)
+ paramQuery := make(map[string]string,0)
+ paramQuery["searchType"] = searchType
+ paramQuery["cameraName"] = cameraName
+ body, err := client.DoGetRequest(url, paramQuery, nil)
if err != nil {
- return nil
+ return false,nil
}
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
- return nil
+ return false,nil
}
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &cameraTasks)
-
- return cameraTasks
+ return res.Success,res.Data
}
+
+////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+//func (api CameraApi) FindAllCameraAndTask() (cameraTasks []protomsg.CameraAndTaskInfo){
+// url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/queryCameraAndTaskInfo"
+// client := NewClient()
+//
+// body, err := client.DoGetRequest(url, nil, nil)
+// if err != nil {
+// return nil
+// }
+//
+// var res Result
+// if err = json.Unmarshal(body, &res); err != nil {
+// logPrint(err)
+// return nil
+// }
+//
+// bytes, _ := json.Marshal(res.Data)
+// err = json.Unmarshal(bytes, &cameraTasks)
+//
+// return cameraTasks
+//}
func (api CameraApi) SaveCameraPolygon(paramBody map[string]interface{}) (bool,interface{}) {
url := api.getBasicUrl() + DATA_URL_PREFIX + "/polygon/save"
@@ -185,7 +223,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -259,7 +297,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -358,7 +396,7 @@
}
b, err := json.Marshal(res.Data)
if err !=nil {
- fmt.Println("unmarshal GetCamerasByRunType.result err")
+ logPrint("unmarshal GetCamerasByRunType.result err")
return false,nil
}
if err = json.Unmarshal(b, &cameras);err !=nil {
@@ -381,7 +419,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -401,7 +439,26 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
+func (api CameraApi) UpdateIsRunningAll(cameraIds []string) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateIsRunningAll"
+ client := NewClient()
+ paramBody :=make(map[string]interface{},0)
+ paramBody["cameraIds"] = cameraIds
+ 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 {
+ logPrint(err)
return false,nil
}
@@ -419,7 +476,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -441,7 +498,7 @@
return true,res.Data
}
-func (api CameraApi) FindAllCameraLink() (bool,interface{}){
+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)
@@ -453,5 +510,80 @@
if err = json.Unmarshal(body, &res); err != nil {
return false,nil
}
- return true,res.Data
+ dataBytes, _ := json.Marshal(res.Data)
+ if err := json.Unmarshal(dataBytes, &list);err !=nil {
+ return false,nil
+ }
+ return true,list
+}
+
+
+func (api CameraApi) FindOnMap(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/findOnMap"
+ 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 {
+ logPrint(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
+func (api CameraApi) UpdatePos(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updatePos"
+ 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 {
+ logPrint(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
+}
+
+func (api CameraApi) GetCoord(cameraId string) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/coord"
+ client := NewClient()
+ paramQuery := map[string]string {
+ "cameraId": cameraId,
+ }
+ 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) UpdateCoord(paramBody map[string]interface{}) (bool,interface{}){
+ url := api.getBasicUrl() + DATA_URL_PREFIX + "/camera/updateCoord"
+ 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 {
+ logPrint(err)
+ return false,nil
+ }
+
+ return res.Success,res.Data
}
\ No newline at end of file
--
Gitblit v1.8.0