From 87eaf67279d2de9b18300f21c65390eaa8907611 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 17:24:41 +0800
Subject: [PATCH] 增加一个init方法
---
insertdata/insertDataToEs.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 60fea44..5384eef 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -71,7 +71,7 @@
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- BaseInfo []*protomsg.Baseinfo `json:"baseInfo"`
+ BaseInfo []*ruleserver.BaseInfo`json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -267,7 +267,7 @@
0,
0,
0,
- []*protomsg.Baseinfo{},
+ []*ruleserver.BaseInfo{},
}
requstbody, err := json.Marshal(pervideo)
@@ -307,7 +307,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -382,7 +382,7 @@
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))
+ resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result),weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
--
Gitblit v1.8.0