From a6a28e08a0031ca046947d67727f0e133c19e4ab Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 09 八月 2019 11:49:25 +0800
Subject: [PATCH] cpu火力全开

---
 insertdata/insertDataToEs.go |  629 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 427 insertions(+), 202 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9b1e92f..1c2f8e2 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -71,6 +71,7 @@
 	AnalyServerName string                 `json:"analyServerName"`
 	AnalyServerIp   string                 `json:"analyServerIp"`
 	ClusterId       string                 `json:"clusterId"`
+	LinkId          string                 `json:"linkId"`
 	DetectScore     float64                `json:"detectScore"`
 	IsAlarm         int                    `json:"isAlarm"`
 	IsAckAlarm      int                    `json:"isAckAlarm"`
@@ -96,6 +97,7 @@
 	ClusterId       string      `json:"clusterId"`
 	PicSmUrl        []string    `json:"picSmUrl"`
 	PicDate         string      `json:"picDate"`
+	LinkId          string      `json:"linkId"`
 	VideoUrl        string      `json:"videoUrl"`
 	IsAlarm         int         `json:"isAlarm"`
 	IsAckAlarm      int         `json:"isAckAlarm"`
@@ -108,39 +110,66 @@
 	AlarmLevel   string `json:"alarmLevel"`
 	RuleText     string `json:"ruleText"`
 	DefenceState bool   `json:"defenceState"`
+	IsLink		 bool	`json:"isLink"`
+}
+
+// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
+type FaceAndRules struct {
+	ruleserver.Arg
+	rules []ruleserver.Result
 }
 
 // 寰�ES鎻掓暟鎹�
+//func InsertToEs(msg ruleserver.ResultMsg) {
+//	var timeLabel string
+//	// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+//	if msg.RuleResult["timeLabel"] != nil {
+//		timeLabel = msg.RuleResult["timeLabel"].(string)
+//	}
+//	logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
+//	if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
+//		InsertFace(msg)
+//		flag := ruleserver.BodyIsSame(msg.SdkMessage)
+//		if !flag {
+//			InsertYolo(msg)
+//		}
+//	}
+//	if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
+//		InsertFace(msg)
+//		InsertYolo(msg)
+//	}
+//	//if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+//	//	//ChangeStatusFace(msg)
+//	//	ChangeStatusYolo(msg)
+//	//}
+//}
 func InsertToEs(msg ruleserver.ResultMsg) {
-	var timeLabel string
-	// 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
-	if msg.RuleResult["timeLabel"] != nil {
-		timeLabel = msg.RuleResult["timeLabel"].(string)
-	}
-	logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
-	if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
-		InsertFace(msg)
+	InsertFace(msg, "")
+	// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
+	fk := ruleserver.TrackOrNot(msg.RuleResult)
+	if fk {
+		InsertYolo(msg, "")
+		//if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
+		//	logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
+		//	os.Exit(1)
+		//}
+	} else {
 		flag := ruleserver.BodyIsSame(msg.SdkMessage)
 		if !flag {
-			InsertYolo(msg)
+			InsertYolo(msg, "")
 		}
 	}
-	if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
-		InsertFace(msg)
-		InsertYolo(msg)
-	}
-	//if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
-	//	//ChangeStatusFace(msg)
-	//	ChangeStatusYolo(msg)
-	//}
 }
 
 // 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg) {
+func InsertFace(msg ruleserver.ResultMsg, linkId string) {
 	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
 		logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
-		for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
-			for _, face := range faceResult.Args {
+		faces := []*FaceAndRules{}
+		faces = PutFace(faces,msg)
+		//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+		if faces != nil {
+			for _,face := range faces {
 				// 涓婁紶澶у浘
 				// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
 				bdata, err := util.UnCompress(msg.Data)
@@ -148,8 +177,12 @@
 					panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
 				}
 				alarmRules := []AlarmRule{}
-				alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
-				alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText,faceResult.DefenceState})
+				logger.Warn("浜鸿劯id涓猴細",face.Id,"浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
+				//os.Exit(1)
+				for _,faceResult := range face.rules {
+					alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
+					alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink})
+				}
 				i := protomsg.Image{}
 				err = proto.Unmarshal(bdata, &i)
 				bigPhotoUrl := make(map[string]interface{})
@@ -181,6 +214,10 @@
 				race := getRaceString(face.ThftRes.Race)
 				ageDescription := getDescription(face.ThftRes.Age)
 				esDataId := uuid.NewV4().String()
+				linksId := ""
+				if linkId != "" {
+					linksId = linkId
+				}
 				pervideo := PerVideoPicture{
 					esDataId,
 					msg.Cid,
@@ -206,6 +243,7 @@
 					localConfig.ServerName,
 					serverIp,
 					"",
+					linksId,
 					face.Score,
 					1,
 					0,
@@ -229,6 +267,275 @@
 				}
 			}
 		}
+	}
+}
+
+// 褰掔疆浜鸿劯
+func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+		for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+			faces = hebingFace(faces, faceResult)
+		}
+		return faces
+	} else {
+		return nil
+	}
+}
+func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
+	for _, arg := range faceResult.Args {
+		// 鎷垮埌姣忎竴寮犱汉鑴�
+		logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
+		flag := false
+		for _, face := range faces {
+			for _,lik := range face.Liker {
+				logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細",lik.PersonId,lik.TableName)
+			}
+			if arg.Id == face.Id {
+				flag = true
+				face.rules = append(face.rules,faceResult.Result)
+				// 鐩镐技鑰呭幓閲嶅綊骞�
+				for _,liker := range arg.Liker {
+					flag1 := true
+					for _,liker1 := range face.Liker {
+						if liker.PersonId == liker1.PersonId {
+							flag1 = false
+						}
+					}
+					if flag1 {
+						face.Liker = append(face.Liker,liker)
+					}
+				}
+				//face.Liker = append(face.Liker,arg.Liker...)
+			}
+		}
+		if !flag {
+			faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+		}
+	}
+	return faces
+}
+
+// 寰�es涓彃鍏olo鏁版嵁
+func InsertYolo(msg ruleserver.ResultMsg, linkId string) {
+	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+		// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+		flag := false
+		for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+			//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+			if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+				flag = true
+			}
+		}
+		if flag {
+			logger.Info("寰�ES鎻抷olo鏁版嵁")
+			var sdkNames string = ""
+			alarmRules := []AlarmRule{}
+			url := []string{}
+			for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+				if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
+					// 鎷煎嚭sdkname
+					//logger.Info("搴旇杩涙潵鎵嶅鐨�")
+					sdkNames = sdkNames + yoloResult.SdkName
+					alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+					alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink})
+					// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
+					if yoloResult.Others.CacheData != nil {
+						//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+						// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+						// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+						msgs := yoloResult.Others.CacheData
+						for _, msg1 := range msgs {
+							bdata, err := util.UnCompress(msg1.Data)
+							if err != nil {
+								panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+							}
+							i := protomsg.Image{}
+							err = proto.Unmarshal(bdata, &i)
+							resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+							if err1 != nil {
+								logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+							} else {
+								logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+							}
+							url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
+						}
+					}
+				}
+			}
+			linkFlag := false
+			for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+				if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
+					linkId := uuid.NewV4().String()
+					for _, msg2 := range yoloResult.Others.LinkCache {
+						logger.Warn("鎻掑叆鑱斿姩鏁版嵁", "姝ゅ抚鏁版嵁鐨刬d涓�", msg2.Cid)
+						InsertYolo(msg2, linkId)
+						linkFlag = true
+					}
+				}
+			}
+			if linkFlag {
+				// 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
+				logger.Warn("鎴愬姛鎻掑叆涓や釜鑱斿姩鍥剧墖")
+				//os.Exit(1)
+				return
+			}
+			//logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
+			isAlarm := 0
+			resp := make(map[string]interface{})
+			// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+			bdata, err := util.UnCompress(msg.Data)
+			if err != nil {
+				panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+			}
+			i := protomsg.Image{}
+			err = proto.Unmarshal(bdata, &i)
+			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), weedfsUrl)
+				if err != nil {
+					logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+				} else {
+					logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+				}
+			} else {
+				isAlarm = 0
+				// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+				return
+			}
+			// 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()
+
+			url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
+			esDataId := uuid.NewV4().String()
+			linksId := ""
+			if linkId != "" {
+				linksId = linkId
+			}
+			peraction := Personaction{
+				esDataId,
+				msg.Cid,
+				camera.Name,
+				camera.Addr,
+				msg.Tasklab.Taskid,
+				msg.Tasklab.Taskname,
+				sdkNames,
+				"",
+				alarmRules,
+				localConfig.ServerId,
+				localConfig.ServerName,
+				serverIp,
+				"",
+				url,
+				i.Timestamp,
+				linksId,
+				"",
+				isAlarm,
+				0,
+				0,
+				0,
+			}
+			requstbody, err := json.Marshal(peraction)
+
+			if err != nil {
+				logger.Info("json parse error ", err)
+				return
+
+			}
+			resp1, err2 := EsReq("POST", personAction, requstbody)
+			if err2 != nil {
+				logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+			} 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})
+				logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+				//os.Exit(1)
+			}
+		} else {
+			logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
+		}
+	}
+}
+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{strings.Split(resp["fileUrl"].(string), "/")[1]},
+		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) {
@@ -282,6 +589,7 @@
 		localConfig.ServerName,
 		serverIp,
 		"",
+		"",
 		0,
 		1,
 		0,
@@ -307,186 +615,6 @@
 	//if msg.RuleResult["cacheData"] != nil {
 	//	InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
 	//}
-}
-
-// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg) {
-	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
-		logger.Info("寰�ES鎻抷olo鏁版嵁")
-		var sdkNames string = ""
-		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,yoloResult.DefenceState})
-		}
-		isAlarm := 0
-		resp := make(map[string]interface{})
-		// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
-		bdata, err := util.UnCompress(msg.Data)
-		if err != nil {
-			panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
-		}
-		i := protomsg.Image{}
-		err = proto.Unmarshal(bdata, &i)
-		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), weedfsUrl)
-			if err != nil {
-				logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
-			} else {
-				logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
-			}
-		} else {
-			isAlarm = 0
-			// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
-			return
-		}
-		// 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()
-		url := []string{}
-		if msg.RuleResult["cacheData"] != nil {
-			//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
-			// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
-			// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
-			msg1 := msg.RuleResult["cacheData"].(ruleserver.ResultMsg)
-			bdata, err := util.UnCompress(msg1.Data)
-			if err != nil {
-				panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
-			}
-			i := protomsg.Image{}
-			err = proto.Unmarshal(bdata, &i)
-			resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
-			if err1 != nil {
-				logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
-			} else {
-				logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
-			}
-			url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
-		}
-		url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
-		esDataId := uuid.NewV4().String()
-		peraction := Personaction{
-			esDataId,
-			msg.Cid,
-			camera.Name,
-			camera.Addr,
-			msg.Tasklab.Taskid,
-			msg.Tasklab.Taskname,
-			sdkNames,
-			"",
-			alarmRules,
-			localConfig.ServerId,
-			localConfig.ServerName,
-			serverIp,
-			"",
-			url,
-			i.Timestamp,
-			"",
-			isAlarm,
-			0,
-			0,
-			0,
-		}
-		requstbody, err := json.Marshal(peraction)
-
-		if err != nil {
-			logger.Info("json parse error ", err)
-			return
-
-		}
-		resp1, err2 := EsReq("POST", personAction, requstbody)
-		if err2 != nil {
-			logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
-		} 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})
-			logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
-			//os.Exit(1)
-		}
-	}
-}
-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{strings.Split(resp["fileUrl"].(string), "/")[1]},
-		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)
-	}
 }
 
 // 鑾峰彇鏈満ip
@@ -571,3 +699,100 @@
 	}
 	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

--
Gitblit v1.8.0