From 850fa0faa05d7cf4e5950915e5597215f021a8cd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 17:58:14 +0800
Subject: [PATCH] change default score value 0.8 to 80
---
insertdata/insertDataToEs.go | 246 -------------------------------------------------
ruleserver/readyDataForRule.go | 2
2 files changed, 1 insertions(+), 247 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c289e64..17f8053 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -478,155 +478,6 @@
}
}
}
-func ChangeStatusYolo(msg ruleserver.ResultMsg) {
- logger.Info("寰�ES鎻抷olo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�")
- var sdkNames string = ""
- alarmRules := []AlarmRule{}
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- 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), weedfsUrl)
- if err != nil {
- logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
- }
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- serverIp, err := GetLocalIP()
- esDataId := uuid.NewV4().String()
- peraction := Personaction{
- esDataId,
- msg.Cid,
- camera.Name,
- camera.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "yolo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�",
- alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- []string{resp["fileUrl"].(string)},
- i.Timestamp,
- "",
- "",
- 0,
- 0,
- 0,
- 0,
- }
- requstbody, err := json.Marshal(peraction)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
-
- }
- resp1, err1 := EsReq("POST", personAction, requstbody)
- if err1 != nil {
- logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
- } else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
- // 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
- logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- //os.Exit(1)
- }
-}
-func ChangeStatusFace(msg ruleserver.ResultMsg) {
- logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
-
- esDataId := uuid.NewV4().String()
- pervideo := PerVideoPicture{
- esDataId,
- msg.Cid,
- camera.Addr,
- i.Timestamp,
- bigPhotoUrl["fileUrl"].(string),
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- "浜鸿劯",
- "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
- []AlarmRule{},
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- "",
- 0,
- "",
- "",
- 0,
- 0,
- "",
- []string{""},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- "",
- 0,
- 1,
- 0,
- 0,
- 0,
- []*ruleserver.BaseInfo{},
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
- resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
-
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
- } else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
- // 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
- }
- //if msg.RuleResult["cacheData"] != nil {
- // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- //}
-}
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
@@ -710,100 +561,3 @@
}
return race
}
-
-
-//for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
-// for _, face := range faceResult.Args {
-// // 涓婁紶澶у浘
-// // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
-// bdata, err := util.UnCompress(msg.Data)
-// if err != nil {
-// panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
-// }
-// alarmRules := []AlarmRule{}
-// alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
-// alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
-// i := protomsg.Image{}
-// err = proto.Unmarshal(bdata, &i)
-// bigPhotoUrl := make(map[string]interface{})
-// bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
-// logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
-// // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
-// localConfig, err := cache.GetServerInfo()
-// if err != nil {
-// logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
-// }
-// serverIp, err := GetLocalIP()
-// // 鏌ヨcameraName
-// camera, err := cache.GetCameraById(msg.Cid)
-// if err != nil {
-// logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
-// }
-// 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)
-// esDataId := uuid.NewV4().String()
-// linksId := ""
-// if linkId != "" {
-// linksId = linkId
-// }
-// pervideo := PerVideoPicture{
-// esDataId,
-// msg.Cid,
-// camera.Addr,
-// i.Timestamp,
-// strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
-// msg.Tasklab.Taskid,
-// msg.Tasklab.Taskname,
-// "浜鸿劯",
-// "",
-// alarmRules,
-// time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
-// sex,
-// face.ThftRes.Age,
-// ageDescription,
-// race,
-// face.ThftRes.Smile,
-// face.ThftRes.Beauty,
-// base64.StdEncoding.EncodeToString(face.Feature),
-// []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
-// "鏆傛棤闆嗙兢",
-// localConfig.ServerId,
-// localConfig.ServerName,
-// serverIp,
-// "",
-// linksId,
-// face.Score,
-// 1,
-// 0,
-// 0,
-// 0,
-// face.Liker,
-// }
-// requstbody, err := json.Marshal(pervideo)
-//
-// if err != nil {
-// logger.Info("json parse error ", err)
-// return
-// }
-// resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
-// if err1 != nil {
-// logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
-// } else {
-// logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
-// // 鍙戝嚭褰曞儚淇″彿
-// ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
-// }
-// }
-//}
\ No newline at end of file
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 21fa0d7..b8538fd 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -297,7 +297,7 @@
func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
- threshold := 0.8 // 鐩镐技搴�
+ threshold := 80.0 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
--
Gitblit v1.8.0