From 509506fd53635830ff43572df0d7845debf376f9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 20:29:48 +0800
Subject: [PATCH] 改造定时器
---
insertdata/insertDataToEs.go | 448 ++++++++++++++++++++++++++++---------------------------
1 files changed, 225 insertions(+), 223 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 99e8323..9f9f4de 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -101,255 +101,257 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
- logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
- for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- 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.Info(bigPhotoUrl)
- if len(face.Liker) == 0 {
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
+ if msg.RuleResult["timeLable"] == "10" {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
+ logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
+ for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
+ // 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
- resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
- if err != nil {
- logger.Error("涓婁紶灏忓浘鍑洪敊")
- }
- logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
- sex := ""
- if face.ThftRes.Gender == 1 {
- sex = "鐢�"
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Info(bigPhotoUrl)
+ if len(face.Liker) == 0 {
+ // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+ resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+ if err != nil {
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
+ }
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
+ sex := ""
+ if face.ThftRes.Gender == 1 {
+ sex = "鐢�"
+ } else {
+ sex = "濂�"
+ }
+ race := getRaceString(face.ThftRes.Race)
+ ageDescription := getDescription(face.ThftRes.Age)
+
+ 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"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ sex,
+ face.ThftRes.Age,
+ ageDescription,
+ race,
+ face.ThftRes.Smile,
+ face.ThftRes.Beauty,
+ string(face.Feature),
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ face.Score,
+ 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)
+ }
+ //logger.Info(err.Error())
} else {
- sex = "濂�"
- }
- race := getRaceString(face.ThftRes.Race)
- ageDescription := getDescription(face.ThftRes.Age)
+ // 浜鸿劯姣斿
+ logger.Warn("___________________________________________杩欐槸鏈塨aseinfo鐨�")
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
+ bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+ resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+ if err != nil {
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
+ }
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
+ sex := ""
+ if face.ThftRes.Gender == 1 {
+ sex = "鐢�"
+ } else {
+ sex = "濂�"
+ }
+ race := getRaceString(face.ThftRes.Race)
+ ageDescription := getDescription(face.ThftRes.Age)
+ 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"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ sex,
+ face.ThftRes.Age,
+ ageDescription,
+ race,
+ face.ThftRes.Smile,
+ face.ThftRes.Beauty,
+ "",
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ face.Score,
+ 1,
+ 0,
+ 0,
+ 0,
+ face.Liker,
+ }
+ requstbody, err := json.Marshal(pervideo)
- 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"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- sex,
- face.ThftRes.Age,
- ageDescription,
- race,
- face.ThftRes.Smile,
- face.ThftRes.Beauty,
- string(face.Feature),
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- face.Score,
- 1,
- 0,
- 0,
- 0,
- []*protomsg.Baseinfo{},
- }
- requstbody, err := json.Marshal(pervideo)
+ if err != nil {
+ logger.Error("json parse error ", err)
+ return
- if err != nil {
- logger.Info("json parse error ", err)
- return
+ }
+ err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ logger.Info("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
}
- err1 := EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---",err1)
- }
- //logger.Info(err.Error())
- } else {
- // 浜鸿劯姣斿
- logger.Warn("___________________________________________杩欐槸鏈塨aseinfo鐨�")
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
+ }
+ }
+ if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+ logger.Info("寰�ES鎻抷olo鏁版嵁")
+ var sdkNames string = ""
+ alarmRules := []AlarmRule{}
+ for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ sdkNames = sdkNames + yoloResult.SdkName
+ alarm := ChangeToString(yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+ }
+ isAlarm := 0
+ resp := make(map[string]interface{})
+ if len(alarmRules) > 0 {
+ isAlarm = 1
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- //logger.Info("-------------------------------------------鐪嬩笅瀹藉拰楂�", i.Width, i.Height)
- bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
- resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
- logger.Error("涓婁紶灏忓浘鍑洪敊")
- }
- logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
- sex := ""
- if face.ThftRes.Gender == 1 {
- sex = "鐢�"
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- sex = "濂�"
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細",resp)
}
- race := getRaceString(face.ThftRes.Race)
- ageDescription := getDescription(face.ThftRes.Age)
- 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"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- sex,
- face.ThftRes.Age,
- ageDescription,
- race,
- face.ThftRes.Smile,
- face.ThftRes.Beauty,
- "",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- face.Score,
- 1,
- 0,
- 0,
- 0,
- face.Liker,
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Error("json parse error ", err)
- return
-
- }
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- logger.Info("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
-
- }
- }
- }
- if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
- logger.Info("寰�ES鎻抷olo鏁版嵁")
- var sdkNames string = ""
- alarmRules := []AlarmRule{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
- }
- isAlarm := 0
- resp := make(map[string]interface{})
- 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 {
- logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細",resp)
+ isAlarm = 0
+ // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ return
}
- } else {
- isAlarm = 0
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- return
- }
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- serverIp, err := GetLocalIP()
- peraction := Personaction{
- uuid.NewV4().String(),
- msg.Cid,
- camera.Name,
- camera.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- time.Now().Format("2006-01-02 15:04:05"),
- "",
- isAlarm,
- 0,
- 0,
- 0,
- }
- requstbody, err := json.Marshal(peraction)
+ // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // 鏌ヨ鏈満淇℃伅
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ serverIp, err := GetLocalIP()
+ peraction := Personaction{
+ uuid.NewV4().String(),
+ msg.Cid,
+ camera.Name,
+ camera.Addr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ "",
+ alarmRules,
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ time.Now().Format("2006-01-02 15:04:05"),
+ "",
+ isAlarm,
+ 0,
+ 0,
+ 0,
+ }
+ requstbody, err := json.Marshal(peraction)
- if err != nil {
- logger.Info("json parse error ", err)
- return
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
- }
- err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
- if err != nil {
- logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
- } else {
- logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- //os.Exit(1)
+ }
+ err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
+ if err != nil {
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ } else {
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
+ }
}
}
}
--
Gitblit v1.8.0