From 032150859e985bedfb5061320b3aed5984dda476 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 18 九月 2019 17:51:02 +0800
Subject: [PATCH] mian函数中加一个异常处理，插入es时大图只插入一次
---
insertdata/insertDataToEs.go | 20 +++++++++++++-------
main.go | 5 +++++
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 6ad03ce..e35ebd2 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -160,6 +160,8 @@
faces = PutFace(faces,msg)
//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
+ var imgMaxUrl string = ""
+ var picTime string = ""
for _,face := range faces {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -174,11 +176,15 @@
alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink,""})
}
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ if imgMaxUrl == "" {
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
+ picTime = i.Timestamp
+ }
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
@@ -217,8 +223,8 @@
esDataId,
msg.Cid,
camera.Addr,
- i.Timestamp,
- bigPhotoUrl["fileUrl"].(string),
+ picTime,
+ imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
diff --git a/main.go b/main.go
index feee24e..d0caff6 100644
--- a/main.go
+++ b/main.go
@@ -48,6 +48,11 @@
}
func main() {
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("鏈�澶栧眰鐨勫紓甯告崟鎹�",err.(string))
+ }
+ }()
go func() {
http.ListenAndServe("0.0.0.0:8899",nil)
}()
--
Gitblit v1.8.0