From d7e55315294961bceb30561a0da562b90fe036c0 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 09 三月 2020 17:15:26 +0800
Subject: [PATCH] add stack updateStatus

---
 cameraApi.go |   68 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/cameraApi.go b/cameraApi.go
index 6c77a00..bef1a77 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
 	}
 
@@ -165,7 +184,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return nil
 	}
 
@@ -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,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 +457,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -441,7 +479,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 +491,9 @@
 	if err = json.Unmarshal(body, &res); err != nil {
 		return false,nil
 	}
-	return true,res.Data
-}
\ No newline at end of file
+	dataBytes, _ := json.Marshal(res.Data)
+	if err := json.Unmarshal(dataBytes, &list);err !=nil {
+		return false,nil
+	}
+	return true,list
+}

--
Gitblit v1.8.0