From ebab43a9b4b58be926f421cab3aae36af02ef994 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 22 七月 2019 12:41:45 +0800
Subject: [PATCH] 人员异常拼接连接符顺序纠正
---
insertdata/insertDataToEs.go | 101 +++++++++++++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 43 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index fcd3103..5f23d6d 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -19,12 +19,15 @@
"ruleprocess/util"
)
-var weedfsUrl,videoPersonUrl,personAction string
+var weedfsUrl, videoPersonUrl, personAction string
type conf struct {
- PhotoUrl string `yaml:"photoUrl"`
- Videopersons string `yaml:"videopersons"`
- Personaction string `yaml:"personaction"`
+ PhotoUrl string `yaml:"photoUrl"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
}
func init() {
@@ -37,41 +40,41 @@
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
weedfsUrl = c.PhotoUrl
- videoPersonUrl = c.Videopersons
- personAction = c.Personaction
+ videoPersonUrl = c.VideoPersons
+ personAction = c.PersonAction
}
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraAddr string `json:"cameraAddr"`
- PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- LikeDate string `json:"likeDate"`
- Sex string `json:"sex"`
- Age int32 `json:"age"`
- AgeDescription string `json:"ageDescription"`
- Race string `json:"race"`
- SmileLevel int32 `json:"smileLevel"`
- BeautyLevel int32 `json:"beautyLevel"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl []string `json:"picSmUrl"`
- VideoUrl string `json:"videoUrl"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- DetectScore float64 `json:"detectScore"`
- IsAlarm int `json:"isAlarm"`
- IsAckAlarm int `json:"isAckAlarm"`
- IsCollect int `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- BaseInfo []*ruleserver.BaseInfo`json:"baseInfo"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ LikeDate string `json:"likeDate"`
+ Sex string `json:"sex"`
+ Age int32 `json:"age"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ SmileLevel int32 `json:"smileLevel"`
+ BeautyLevel int32 `json:"beautyLevel"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -206,9 +209,12 @@
logger.Info("json parse error ", err)
return
}
- err1 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
}
}
}
@@ -275,9 +281,13 @@
logger.Info("json parse error ", err)
return
}
- err1 := EsReq("POST", videoPersonUrl, requstbody)
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
}
//if msg.RuleResult["cacheData"] != nil {
// InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -307,7 +317,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result))
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -359,10 +369,13 @@
return
}
- err = EsReq("POST", personAction, requstbody)
- if err != nil {
+ resp1, err2 := EsReq("POST", personAction, requstbody)
+ if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
+ logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
@@ -382,7 +395,7 @@
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))
+ resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -429,10 +442,12 @@
return
}
- err = EsReq("POST", personAction, requstbody)
- if err != nil {
+ resp1, err1 := EsReq("POST", personAction, requstbody)
+ if err1 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
--
Gitblit v1.8.0