From dd22b06de7f871789122c44ef65acb9a56017956 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 22 十一月 2019 19:19:10 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1b61223..3b86ac5 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -97,7 +97,8 @@
type Target struct {
TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
- FaceFeature string `json:"feature"`
+ TargetType string `json:"targetType"`
+ Feature string `json:"feature"`
PicSmUrl string `json:"picSmUrl"`
TargetLocation Points `json:"targetLocation"`
}
@@ -111,33 +112,6 @@
X float64 `json:"x"`
Y float64 `json:"y"`
}
-
-// yolo琛屼负鐨勬暟鎹粨鏋�
-//type Personaction struct {
-// Id string `json:"id"`
-// CameraId string `json:"cameraId"`
-// CameraName string `json:"cameraName"`
-// CameraAddr string `json:"cameraAddr"`
-// TaskId string `json:"taskId"`
-// TaskName string `json:"taskName"`
-// SdkName string `json:"sdkName"`
-// Content string `json:"content"`
-// AlarmRules []AlarmRule `json:"alarmRules"`
-// AnalyServerId string `json:"analyServerId"`
-// AnalyServerName string `json:"analyServerName"`
-// AnalyServerIp string `json:"analyServerIp"`
-// ClusterId string `json:"clusterId"`
-// PicSmUrl []string `json:"picSmUrl"`
-// PicDate string `json:"picDate"`
-// VideoUrl string `json:"videoUrl"`
-// IsAlarm int `json:"isAlarm"`
-// IsAckAlarm int `json:"isAckAlarm"`
-// IsCollect int `json:"isCollect"`
-// IsDelete int `json:"isDelete"`
-// TargetInfo []Target `json:"targetInfo"`
-// LinkTag string `json:"linkTag"`
-// LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
-//}
type AlarmRule struct {
GroupId string `json:"groupId"`
@@ -154,11 +128,11 @@
}
func InsertToEs(msg structure.ResultMsg) {
- //defer func() {
- // if err := recover(); err != nil {
- // logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
- // }
- //}()
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ }
+ }()
localConfig1, err := cache.GetServerInfo()
if err != nil {
panic("閰嶇疆鏂囦欢涓嶅悎娉�")
@@ -197,7 +171,7 @@
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))
+ 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),face.Type)
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
logger.Error("涓婁紶灏忓浘鍑洪敊")
@@ -214,7 +188,8 @@
var target = new(Target)
target.TargetId = face.Id
target.TargetScore = face.Score
- target.FaceFeature = base64.StdEncoding.EncodeToString(face.Feature)
+ target.TargetType = face.Type
+ target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
target.PicSmUrl = resp["fileUrl"].(string)
target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
var targetInfos []Target
@@ -227,6 +202,7 @@
case "plate":
sdkname = "杞︾墝璇嗗埆"
}
+ logger.Info("浜鸿劯鐩爣target:",targetInfos)
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -237,7 +213,7 @@
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkname,
- time.Now().Format("2006-01-02 15:04:05"),
+ "",
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
lable,
@@ -266,7 +242,7 @@
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭�(浜鸿劯)锛�", resp1)
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", sdkname, "---", resp1)
// 鍙戝嚭褰曞儚淇″彿
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
}
@@ -385,6 +361,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
+ target1.TargetType = "action"
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
@@ -585,6 +562,7 @@
var target1 = new(Target)
target1.TargetId = target.Id
target1.TargetScore = target.Score
+ target1.TargetType = "action"
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
}
@@ -620,7 +598,7 @@
false,
false,
nil,
- nil,
+ targetInfos,
linkTag,
linkTagInfos,
}
@@ -771,15 +749,16 @@
}
race := getRaceString(obj.ThftRes.Race)
ageDescription := getDescription(obj.ThftRes.Age)
- lable = sex + "/" + ageDescription + "/" + race + "/"
+ lable = sex + "/" + ageDescription + "/" + race
lableAttach = strconv.Itoa(int(obj.ThftRes.Age)) + "宀�" + "/" + "寰瑧鍊硷細" + strconv.Itoa(int(obj.ThftRes.Smile)) + "/" + "棰滃�硷細" + strconv.Itoa(int(obj.ThftRes.Beauty))
case "plate":
// 杞︾墝杩愬姩鏂瑰悜锛�0 unknown, 1 left, 2 right, 3 up, 4 down
- lable = obj.Car.License + "/" + cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "杞︾墝" + "/" +
- cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor))) + "杞﹁締" + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo))) + "/" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarType)))
- lableAttach = cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection))) + "/" + "杞︾墝缃俊搴︼細" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" +
- "杞︾墝浜害锛�" + strconv.Itoa(int(obj.Car.NBright)) + "/" + "杞︾殑浜害锛�" + strconv.Itoa(int(obj.Car.NCarBright)) + "/" + "璇嗗埆鏃堕棿锛�" + strconv.Itoa(int(obj.Car.NTime))
+ lable = obj.Car.License + "/" + cache.GetDic("nVehicleColor1"+strconv.Itoa(int(obj.Car.NVehicleColor1))) + "杞﹁締" + "/" +
+ cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "杞︾墝"
+ lableAttach = "杞︾墝缃俊搴︼細" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" + "杞︾殑浜害锛�" + strconv.Itoa(int(obj.Car.NVehicleBright)) +"/"+ "杞︾墝绫诲瀷"+cache.GetDic("nType"+strconv.Itoa(int(obj.Car.NType)))+
+ "杞﹁韩杈呴鑹诧細"+cache.GetDic("nVehicleColor2"+strconv.Itoa(int(obj.Car.NVehicleColor2)))+"/"+"鏄惁璇嗗埆鍒拌溅鐗岋細"+cache.GetDic("nVehicleColor1"+strconv.Itoa(int(obj.Car.NVehicleColor1)))+"/"+
+ "杞﹁締缃俊搴�"+strconv.Itoa(int(obj.Score))+"/"+"鍝佺墝锛�" +obj.Car.VehicleType1
}
return lable, lableAttach
}
--
Gitblit v1.8.0