From fd04fb054dd9bdfafd04c24bdab43b5cd2b09b2e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 14:47:26 +0800
Subject: [PATCH] 非报警数据不存

---
 insertdata/insertDataToEs.go |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 551b5fe..00fe813 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -178,6 +178,7 @@
 				}
 				isAlarm := ""
 				resp := make(map[string]interface{})
+				resp["fileUrl"] = ""
 				if len(alarmRules) > 0 {
 					isAlarm = "1"
 					// 瑙e帇缂╁苟涓婁紶鍥剧墖
@@ -187,11 +188,12 @@
 					}
 					i := protomsg.Image{}
 					err = proto.Unmarshal(bdata, &i)
-					resp,err = util.PostFormBufferData(weedfsUrl,i.Data,uuid.NewV4().String())
+					resp,err = util.PostFormBufferData(weedfsUrl,i,uuid.NewV4().String())
 					log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
 				}else {
 					isAlarm = "0"
-					//continue
+					// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+					continue
 				}
 				log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細",resp)
 				// 鏌ヨ鏈満淇℃伅
@@ -201,7 +203,7 @@
 				}
 				// 鏌ヨcameraName
 				camera,err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
-				if err == nil {
+				if err != nil {
 					log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
 				}
 				serverIp,err := GetLocalIP()

--
Gitblit v1.8.0