From 9126bb1f11799ace90ed8de69cec15188b162eb4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 10:04:48 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 187 ++++++++++++++++++++++++++++++++--------------
1 files changed, 131 insertions(+), 56 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 15aa12f..b50614c 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -4,9 +4,10 @@
"encoding/json"
"errors"
"fmt"
- "log"
+ "io/ioutil"
"net"
"ruleprocess/cache"
+ "ruleprocess/logger"
"strings"
"time"
@@ -15,9 +16,21 @@
"github.com/satori/go.uuid"
"ruleprocess/ruleserver"
"ruleprocess/util"
+ "github.com/go-yaml/yaml"
)
+var weedfsUrl string
+type conf struct {
+ PhotoUrl string
+}
+func init() {
+ logger.Info("_________________________________________鑰佸瓙鎯崇湅浣犳墽琛屼簡娌�")
+ data, _ := ioutil.ReadFile("conf.yml")
+ c := conf{}
+ //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
+ yaml.Unmarshal(data, &c)
+ weedfsUrl = c.PhotoUrl
+}
-var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
Id string `json:"id"`
@@ -43,25 +56,11 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- BaseInfo []Base `json:"baseInfo"`
-}
-
-type Base struct {
- TableId string `json:"tableId"`
- TableName string `json:"tableName"`
- CompareScore float64 `json:"compareScore"`
- PersonId string `json:"personId"`
- PersonName string `json:"personName"`
- PersonPicUrl string `json:"personPicUrl"`
- PhoneNum string `json:"phoneNum"`
- Sex string `json:"sex"`
- IdCard string `json:"idCard"`
- MonitorLevel string `json:"monitorLevel"`
- Content string `json:"content"`
+ BaseInfo []*protomsg.Baseinfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -82,9 +81,9 @@
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
VideoUrl string `json:"videoUrl"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
}
@@ -98,8 +97,9 @@
func InsertToEs(msg ruleserver.ResultMsg) {
// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+ logger.Info("------------------------------------浠庨厤缃枃浠惰鍙栫殑鍊硷細",weedfsUrl)
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
- log.Println("寰�ES鎻掍汉鑴告暟鎹�")
+ logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -111,12 +111,12 @@
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- fmt.Println(bigPhotoUrl)
+ logger.Info(bigPhotoUrl)
if len(face.Liker) == 0 {
// 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
localConfig, err := cache.GetServerInfo()
if err != nil {
- log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
serverIp, err := GetLocalIP()
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -127,16 +127,17 @@
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("-------------------------------------------鐪嬩笅瀹藉拰楂�",i.Width,i.Height)
+ //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 {
- log.Println("涓婁紶灏忓浘鍑洪敊")
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
}
+ logger.Info("================灏忓浘鍦板潃:",resp["fileUrl"].(string))
sex := ""
if face.ThftRes.Gender == 1 {
sex = "鐢�"
@@ -163,35 +164,109 @@
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
- "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
+ string(face.Feature),
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
serverIp,
"",
- "",
- "",
- "",
+ 1,
0,
- []Base{},
+ 0,
+ 0,
+ []*protomsg.Baseinfo{},
}
requstbody, err := json.Marshal(pervideo)
if err != nil {
- log.Println("json parse error ", err)
+ logger.Info("json parse error ", err)
return
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- log.Println(err)
+ //logger.Info(err.Error())
} else {
- log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
+ // 浜鸿劯鎻愬彇
+ 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,
+ "",
+ 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("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
+
+ fmt.Println("------------------------------------------鍝堝搱鍝堝搱锛屽簳搴撴湁浜�")
+
}
}
}
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
- log.Println("寰�ES鎻抷olo鏁版嵁")
+ logger.Info("寰�ES鎻抷olo鏁版嵁")
var sdkNames string = ""
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
@@ -199,10 +274,10 @@
alarm := ChangeToString(yoloResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
- isAlarm := ""
+ isAlarm := 0
resp := make(map[string]interface{})
if len(alarmRules) > 0 {
- isAlarm = "1"
+ isAlarm = 1
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
if err != nil {
@@ -211,27 +286,27 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i)
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i,msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
- log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
- log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
+ logger.Info("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
} else {
- isAlarm = "0"
+ isAlarm = 0
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- // log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
if err != nil {
- log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
- log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
peraction := Personaction{
@@ -252,22 +327,22 @@
time.Now().Format("2006-01-02 15:04:05"),
"",
isAlarm,
- "",
- "",
+ 0,
+ 0,
0,
}
requstbody, err := json.Marshal(peraction)
if err != nil {
- log.Println("json parse error ", err)
+ logger.Info("json parse error ", err)
return
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- log.Println("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
- log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
+ logger.Info("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
}
}
}
@@ -322,7 +397,7 @@
}
//鑾峰彇骞撮緞鎻忚堪
-func getDescription (age int32) string{
+func getDescription(age int32) string {
ageInfo := "闈掑勾"
if age > 0 && age < 7 {
ageInfo = "绔ュ勾"
@@ -338,14 +413,14 @@
return ageInfo
}
-func getRaceString (i int32) string{
+func getRaceString(i int32) string {
race := ""
if i == 1 {
race = "鐧戒汉"
- } else if i == 2{
+ } else if i == 2 {
race = "榛勪汉"
} else {
race = "榛戜汉"
}
return race
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0