From c1490f15954a4b67e5248fd2ca4cd2d5b5415647 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期三, 24 七月 2019 11:04:08 +0800 Subject: [PATCH] --- --- insertdata/insertDataToEs.go | 49 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 33 insertions(+), 16 deletions(-) diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go index e0b081d..28ccb80 100644 --- a/insertdata/insertDataToEs.go +++ b/insertdata/insertDataToEs.go @@ -23,11 +23,11 @@ type conf struct { PhotoUrl string `yaml:"photoUrl"` - Videopersons string `yaml:"videoPersons"` - Personaction string `yaml:"personAction"` - Serverip string `yaml:"serverIp"` - Serverport string `yaml:"serverPort"` - Dbtablepersons string `yaml:"dbTablePersons"` + VideoPersons string `yaml:"videoPersons"` + PersonAction string `yaml:"personAction"` + ServerIp string `yaml:"serverIp"` + ServerPort string `yaml:"serverPort"` + DbTablePersons string `yaml:"dbTablePersons"` } func init() { @@ -40,8 +40,8 @@ //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙f瀽鎴恠truct绫诲瀷 yaml.Unmarshal(data, &c) weedfsUrl = c.PhotoUrl - videoPersonUrl = c.Videopersons - personAction = c.Personaction + videoPersonUrl = c.VideoPersons + personAction = c.PersonAction } // 浜鸿劯鐨勬暟鎹粨鏋� @@ -209,9 +209,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{}}) } } } @@ -278,9 +282,14 @@ 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)) @@ -333,6 +342,11 @@ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�") } serverIp, err := GetLocalIP() + if msg.RuleResult["cacheData"] != nil { + InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg)) + // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘� + + } peraction := Personaction{ uuid.NewV4().String(), msg.Cid, @@ -362,15 +376,15 @@ 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) - } - if msg.RuleResult["cacheData"] != nil { - InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg)) } } } @@ -432,10 +446,13 @@ 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