From d81dee97316758a8d7910cf337667cbe4a3eabed Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 10:51:10 +0800
Subject: [PATCH] 放开yolo，加个上传yolo退出
---
insertdata/insertDataToEs.go | 162 +++++++++++++++++++++++++++--------------------------
ruleserver/ruleToformula.go | 2
2 files changed, 83 insertions(+), 81 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 10cafc5..618fb62 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,6 +1,7 @@
package insertdata
import (
+ "os"
"ruleprocess/logger"
"encoding/json"
"errors"
@@ -274,86 +275,87 @@
}
}
}
- //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("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
- // }
- // } 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)
- //
- // 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.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- // }
- //}
+ 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("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ }
+ } 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)
+
+ 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)
+ }
+ }
}
// 鑾峰彇鏈満ip
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c192ee5..68f5380 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -444,7 +444,7 @@
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
}
}
- logger.Info("-------------------閲嶇疆瀹氭椂鍣ㄥ苟杩斿洖false---------------")
+ logger.Info("-------------------閲嶇疆鍙兘瀛樺湪鐨勫畾鏃跺櫒骞惰繑鍥瀎alse---------------")
return false
} else {
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
--
Gitblit v1.8.0