From ee960033e881a16f0243a349036b7fdac8975228 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 15:05:30 +0800
Subject: [PATCH] 人脸多区域坐标去重

---
 insertdata/insertDataToEs.go |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 4e9491a..ffb81ab 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -104,9 +104,10 @@
 }
 
 type AlarmRule struct {
-	GroupId    string `json:"groupId"`
-	AlarmLevel string `json:"alarmLevel"`
-	RuleText   string `json:"ruleText"`
+	GroupId      string `json:"groupId"`
+	AlarmLevel   string `json:"alarmLevel"`
+	RuleText     string `json:"ruleText"`
+	DefenceState bool   `json:"defenceState"`
 }
 
 // 寰�ES鎻掓暟鎹�
@@ -126,10 +127,10 @@
 		InsertYolo(msg)
 
 	}
-	if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
-		//ChangeStatusFace(msg)
-		ChangeStatusYolo(msg)
-	}
+	//if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+	//	//ChangeStatusFace(msg)
+	//	ChangeStatusYolo(msg)
+	//}
 }
 
 // 寰�es涓彃鍏ヤ汉鑴告暟鎹�
@@ -145,8 +146,8 @@
 					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
 				}
 				alarmRules := []AlarmRule{}
-				alarm := ChangeToString(faceResult.DefenceState,faceResult.AlarmLevel)
-				alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
+				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{})
@@ -222,7 +223,7 @@
 				} 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})
+					ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
 				}
 			}
 		}
@@ -299,7 +300,7 @@
 	} 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 })
+		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))
@@ -314,8 +315,8 @@
 		alarmRules := []AlarmRule{}
 		for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
 			sdkNames = sdkNames + yoloResult.SdkName
-			alarm := ChangeToString(yoloResult.DefenceState,yoloResult.AlarmLevel)
-			alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+			alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+			alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
 		}
 		isAlarm := 0
 		resp := make(map[string]interface{})
@@ -409,7 +410,7 @@
 		} else {
 			logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1)
 			// 鍙戝嚭褰曞儚淇″彿
-			ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:2 })
+			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)
 		}
@@ -480,7 +481,7 @@
 	} 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 })
+		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)
 	}
@@ -515,7 +516,7 @@
 }
 
 // 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(defenceState bool,i int32) string {
+func ChangeToString(defenceState bool, i int32) string {
 	alarm := ""
 	if defenceState {
 		if i == 1 {

--
Gitblit v1.8.0