From 5a9b7c4a4f926aaf79fbcc6356fe9e2a77cd248d Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 02 十一月 2020 16:28:43 +0800
Subject: [PATCH] 添加算法的delete

---
 cameraApi.go |   97 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/cameraApi.go b/cameraApi.go
index c0e2124..01682c3 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
 	}
 
@@ -144,7 +143,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return nil
 	}
 
@@ -173,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"
@@ -205,7 +223,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -279,7 +297,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -378,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 {
@@ -401,7 +419,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -421,7 +439,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -440,7 +458,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -458,7 +476,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -498,3 +516,38 @@
 	}
 	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
+}
\ No newline at end of file

--
Gitblit v1.8.0