From 9f410d497dbc50f83b08b4657d3b122679301cd8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 24 二月 2020 18:12:53 +0800
Subject: [PATCH] logPrint

---
 syssetApi.go      |    5 -
 taskSdkRuleApi.go |    9 +-
 fileStack.go      |   27 +++++++++
 sdkApi.go         |   11 +--
 cameraApi.go      |   21 +++---
 fileAnalysis.go   |   11 +--
 soApi.go          |    5 -
 client.go         |   14 ++++
 eventPush.go      |    5 -
 taskApi.go        |    7 +-
 areaApi.go        |    3 
 dicApi.go         |    5 -
 12 files changed, 76 insertions(+), 47 deletions(-)

diff --git a/areaApi.go b/areaApi.go
index 64fb84a..e23ee39 100644
--- a/areaApi.go
+++ b/areaApi.go
@@ -2,7 +2,6 @@
 
 import (
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -150,7 +149,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return flag
 	}
 	flag = res.Success
diff --git a/cameraApi.go b/cameraApi.go
index c0e2124..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
 	}
 
@@ -144,7 +143,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return nil
 	}
 
@@ -185,7 +184,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return nil
 	}
 
@@ -205,7 +204,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -279,7 +278,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -378,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 {
@@ -401,7 +400,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -421,7 +420,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -440,7 +439,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -458,7 +457,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
diff --git a/client.go b/client.go
index 98807f2..d3539b0 100644
--- a/client.go
+++ b/client.go
@@ -1,6 +1,9 @@
 package dbapi
 
-import "strconv"
+import (
+	"fmt"
+	"strconv"
+)
 
 type Client interface {
 	//GET
@@ -25,7 +28,16 @@
 	CONTENT_TYPE_JSON    = "application/json"
 )
 
+var logPrint = func(i ...interface{}) {
+	fmt.Println(i)
+}
 //鍒濆鍖杁bserver鐨勫湴鍧�鍜岀鍙�
 func Init(ip string,port int){
 	BASIC_URL = "http://"+ ip + ":" + strconv.Itoa(port)
+}
+
+func InitLog(fn func(i ...interface{})) {
+	if fn != nil {
+		logPrint = fn
+	}
 }
\ No newline at end of file
diff --git a/dicApi.go b/dicApi.go
index bd0edda..8b697d8 100644
--- a/dicApi.go
+++ b/dicApi.go
@@ -2,7 +2,6 @@
 
 import (
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -35,7 +34,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success,res.Data
@@ -52,7 +51,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success,res.Data
diff --git a/eventPush.go b/eventPush.go
index 090ece0..c32c6c6 100644
--- a/eventPush.go
+++ b/eventPush.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -35,7 +34,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -92,7 +91,7 @@
 	bytes, _ := json.Marshal(res.Data)
 	err = json.Unmarshal(bytes, &allRules)
 	if err !=nil{
-		fmt.Println("all eventPushRules unmarshal err:",err)
+		logPrint("all eventPushRules unmarshal err:",err)
 		return false,nil
 	}
 	return true,allRules
diff --git a/fileAnalysis.go b/fileAnalysis.go
index cfe4e44..4f4df2b 100644
--- a/fileAnalysis.go
+++ b/fileAnalysis.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -133,7 +132,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -153,7 +152,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -174,7 +173,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -194,7 +193,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -215,7 +214,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
diff --git a/fileStack.go b/fileStack.go
index 684486c..12ed847 100644
--- a/fileStack.go
+++ b/fileStack.go
@@ -1,6 +1,7 @@
 package dbapi
 
 import (
+	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
 	"strconv"
 )
@@ -77,6 +78,32 @@
 	return res.Success, res.Data
 }
 
+func (api FileStackApi) FindAll() (flag bool,stacks []protomsg.FileStack){
+	url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileStack/findAll"
+	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
+	}
+
+	b, err := json.Marshal(res.Data)
+	if err !=nil {
+		logPrint("unmarshal GetCamerasByRunType.result err")
+		return false,nil
+	}
+	if err = json.Unmarshal(b, &stacks);err !=nil {
+		return false,nil
+	} else {
+		return true,stacks
+	}
+}
+
 func (api FileStackApi) ChangeEnable(id string,enable bool) bool {
 	url := api.getBasicUrl() + DATA_URL_PREFIX + "/fileStack/changeEnable"
 	client := NewClient()
diff --git a/sdkApi.go b/sdkApi.go
index 6f8d053..b85def6 100644
--- a/sdkApi.go
+++ b/sdkApi.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -36,7 +35,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return flag,nil
 	}
 	return res.Success,res.Data
@@ -55,7 +54,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return sdkArr
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -113,7 +112,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success,res.Data
@@ -130,7 +129,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -150,7 +149,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	bytes, _ := json.Marshal(res.Data)
diff --git a/soApi.go b/soApi.go
index fc888b5..02caeee 100644
--- a/soApi.go
+++ b/soApi.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -36,7 +35,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return soInfos
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -53,7 +52,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success,res.Data
diff --git a/syssetApi.go b/syssetApi.go
index ab7f328..f5260c4 100644
--- a/syssetApi.go
+++ b/syssetApi.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -64,7 +63,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
@@ -83,7 +82,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 
diff --git a/taskApi.go b/taskApi.go
index 51e1d21..9c7d2a1 100644
--- a/taskApi.go
+++ b/taskApi.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -36,7 +35,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return taskInfos
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -56,7 +55,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return taskInfos
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -100,7 +99,7 @@
 	}
 	var res Result
 	if err = json.Unmarshal(respBody, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	return res.Success,res.Data
diff --git a/taskSdkRuleApi.go b/taskSdkRuleApi.go
index 9b31170..dd95155 100644
--- a/taskSdkRuleApi.go
+++ b/taskSdkRuleApi.go
@@ -3,7 +3,6 @@
 import (
 	"basic.com/pubsub/protomsg.git"
 	"encoding/json"
-	"fmt"
 	"strconv"
 )
 
@@ -35,7 +34,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 	bytes, _ := json.Marshal(res.Data)
@@ -59,7 +58,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,err
 	}
 	return res.Success,res.Data
@@ -79,7 +78,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false
 	}
 
@@ -96,7 +95,7 @@
 
 	var res Result
 	if err = json.Unmarshal(body, &res); err != nil {
-		fmt.Println(err)
+		logPrint(err)
 		return false,nil
 	}
 

--
Gitblit v1.8.0