From 5e7865c0c5ebd780033bef147a819992638ede67 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 13 七月 2020 15:38:00 +0800
Subject: [PATCH] fix
---
cameraApi.go | 83 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 32 deletions(-)
diff --git a/cameraApi.go b/cameraApi.go
index 79abb34..794fb7f 100644
--- a/cameraApi.go
+++ b/cameraApi.go
@@ -3,7 +3,6 @@
import (
"basic.com/pubsub/protomsg.git"
"encoding/json"
- "fmt"
"strconv"
)
@@ -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,27 @@
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 {
- fmt.Println(err)
- return nil
- }
-
- bytes, _ := json.Marshal(res.Data)
- err = json.Unmarshal(bytes, &cameraTasks)
-
- return cameraTasks
-}
+////鑾峰彇鎵�鏈夋憚鍍忔満鐨勪俊鎭互鍙婂叾鎵�鏈変换鍔�
+//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 +204,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -259,7 +278,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -358,7 +377,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 +400,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -401,7 +420,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -420,7 +439,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -438,7 +457,7 @@
var res Result
if err = json.Unmarshal(body, &res); err != nil {
- fmt.Println(err)
+ logPrint(err)
return false,nil
}
@@ -477,4 +496,4 @@
return false,nil
}
return true,list
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0