From c96ee33073d49c78db89c2f873c64cfc73efaa9b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 11:31:53 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 68 ++++++++++++----------------------
1 files changed, 24 insertions(+), 44 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index b03ad7e..c3923fd 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -49,8 +49,8 @@
Content string `json:"content"`
AlarmRules []AlarmRule `json:"alarmRules"`
LikeDate string `json:"likeDate"`
- ShowLables string `json:"showLables"`
- OtherLables string `json:"otherLables"`
+ ShowLabels string `json:"showLabels"`
+ OtherLabels string `json:"otherLabels"`
VideoUrl string `json:"videoUrl"`
AnalyServerId string `json:"analyServerId"`
AnalyServerName string `json:"analyServerName"`
@@ -79,8 +79,8 @@
Content string `json:"content"`
AlarmRules []AlarmRule `json:"alarmRules"`
LikeDate string `json:"likeDate"`
- ShowLables string `json:"showLables"`
- OtherLables string `json:"otherLables"`
+ ShowLabels string `json:"showLabels"`
+ OtherLabels string `json:"otherLabels"`
VideoUrl string `json:"videoUrl"`
AnalyServerId string `json:"analyServerId"`
AnalyServerName string `json:"analyServerName"`
@@ -97,7 +97,7 @@
type Target struct {
TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
- FaceFeature string `json:"faceFeature"`
+ FaceFeature string `json:"feature"`
PicSmUrl string `json:"picSmUrl"`
TargetLocation Points `json:"targetLocation"`
}
@@ -111,33 +111,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,18 +127,17 @@
}
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("閰嶇疆鏂囦欢涓嶅悎娉�")
}
weedfsUrl = "http://" + localConfig1.WebPicIp + ":" + strconv.Itoa(int(localConfig1.WebPicPort)) + "/submit"
- videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
- personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
+ videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.AIOcean.IndexName + "/" + EsInfo.EsIndex.AIOcean.IndexType
InsertFace(msg)
InsertYolo(msg)
InsertTarget(msg)
@@ -220,6 +192,14 @@
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
targetInfos = append(targetInfos, *target)
+
+ sdkname := ""
+ switch key {
+ case "face":
+ sdkname = "浜鸿劯"
+ case "plate":
+ sdkname = "杞︾墝璇嗗埆"
+ }
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -229,8 +209,8 @@
imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- "浜鸿劯",
- time.Now().Format("2006-01-02 15:04:05"),
+ sdkname,
+ "",
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
lable,
@@ -259,7 +239,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})
}
@@ -465,7 +445,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", personAction, requstbody)
+ resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -626,7 +606,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", personAction, requstbody)
+ resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
--
Gitblit v1.8.0