From a45592706eb49497bda7e69e27cd76bd2da28ae7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 13 七月 2019 17:06:03 +0800
Subject: [PATCH] 缓存数据空指针控制
---
insertdata/insertDataToEs.go | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 51ed49c..0134a6d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,7 +6,6 @@
"fmt"
"io/ioutil"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -170,7 +169,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
@@ -239,7 +238,7 @@
uuid.NewV4().String(),
msg.Cid,
camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
@@ -292,15 +291,15 @@
}
isAlarm := 0
resp := make(map[string]interface{})
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
if len(alarmRules) > 0 {
isAlarm = 1
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
@@ -340,7 +339,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
isAlarm,
0,
@@ -361,9 +360,9 @@
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
- logger.Debug("============鐬呯瀰缂撳瓨鏁版嵁锛�",msg.RuleResult["cacheData"].(ruleserver.ResultMsg).RuleResult)
- InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- os.Exit(1)
+ if msg.RuleResult["cacheData"] != nil {
+ InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ }
}
}
func ChangeStatusYolo(msg ruleserver.ResultMsg) {
@@ -410,7 +409,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
0,
0,
--
Gitblit v1.8.0