From 811da147dccb634292afc698d73decc23ea77bf1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 15 七月 2019 15:58:30 +0800
Subject: [PATCH] 更新cache解决区域重复问题，开始标签过滤器模块，把数据准备的代码拆出来
---
insertdata/insertDataToEs.go | 174 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 90 insertions(+), 84 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 51ed49c..60fea44 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,7 +6,6 @@
"fmt"
"io/ioutil"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strings"
@@ -20,10 +19,12 @@
"ruleprocess/util"
)
-var weedfsUrl string
+var weedfsUrl,videoPersonUrl,personAction string
type conf struct {
- PhotoUrl string `yaml:"photoUrl"`
+ PhotoUrl string `yaml:"photoUrl"`
+ Videopersons string `yaml:"videopersons"`
+ Personaction string `yaml:"personaction"`
}
func init() {
@@ -36,6 +37,8 @@
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
weedfsUrl = c.PhotoUrl
+ videoPersonUrl = c.Videopersons
+ personAction = c.Personaction
}
// 浜鸿劯鐨勬暟鎹粨鏋�
@@ -119,7 +122,7 @@
}
if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
- ChangeStatusFace(msg)
+ //ChangeStatusFace(msg)
ChangeStatusYolo(msg)
}
}
@@ -170,7 +173,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,
@@ -203,7 +206,7 @@
logger.Info("json parse error ", err)
return
}
- err1 := EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ err1 := EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
}
@@ -211,72 +214,74 @@
}
}
func ChangeStatusFace(msg ruleserver.ResultMsg) {
- logger.Info("寰�ES鎻掗潪鎶ヨ浣嗘槸鐘舵�佽浆鎹㈡暟鎹�")
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- 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)
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
+ logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ 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)
+ // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
- pervideo := PerVideoPicture{
- uuid.NewV4().String(),
- msg.Cid,
- camera.Addr,
- time.Now().Format("2006-01-02 15:04:05"),
- strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- "浜鸿劯",
- "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- "",
- 0,
- "",
- "",
- 0,
- 0,
- "",
- []string{""},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- 0,
- 1,
- 0,
- 0,
- 0,
- []*protomsg.Baseinfo{},
- }
- requstbody, err := json.Marshal(pervideo)
+ pervideo := PerVideoPicture{
+ uuid.NewV4().String(),
+ msg.Cid,
+ camera.Addr,
+ i.Timestamp,
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ "",
+ 0,
+ "",
+ "",
+ 0,
+ 0,
+ "",
+ []string{""},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ []*protomsg.Baseinfo{},
+ }
+ requstbody, err := json.Marshal(pervideo)
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
- err1 := EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
- }
- InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
+ err1 := EsReq("POST", videoPersonUrl, requstbody)
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ }
+ //if msg.RuleResult["cacheData"] != nil {
+ // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ //}
}
// 寰�es涓彃鍏olo鏁版嵁
@@ -292,15 +297,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 +345,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
isAlarm,
0,
@@ -354,16 +359,16 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ err = EsReq("POST", personAction, requstbody)
if err != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
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 +415,7 @@
serverIp,
"",
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
+ i.Timestamp,
"",
0,
0,
@@ -424,7 +429,7 @@
return
}
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ err = EsReq("POST", personAction, requstbody)
if err != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -432,6 +437,7 @@
//os.Exit(1)
}
}
+
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
var (
--
Gitblit v1.8.0