From 74b51d7b71fa71788754285691ecbaf5d34f7d70 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 11:57:39 +0800
Subject: [PATCH] 为数据写入当前规则处理时间

---
 insertdata/insertDataToEs.go | 1151 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 758 insertions(+), 393 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 28ccb80..41f90c8 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,18 +1,17 @@
 package insertdata
 
 import (
+	"basic.com/valib/logger.git"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"fmt"
-	"io/ioutil"
 	"net"
 	"ruleprocess/cache"
-	"ruleprocess/logger"
-	"strings"
+	"ruleprocess/structure"
+	"strconv"
 	"time"
 
 	"basic.com/pubsub/protomsg.git"
-	"github.com/go-yaml/yaml"
 	"github.com/golang/protobuf/proto"
 	"github.com/satori/go.uuid"
 	"ruleprocess/ruleserver"
@@ -30,51 +29,99 @@
 	DbTablePersons string `yaml:"dbTablePersons"`
 }
 
-func init() {
-	data, err := ioutil.ReadFile("./config/conf.yml")
-	if err != nil {
-		fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
-		logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
-	}
-	c := conf{}
-	//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙f瀽鎴恠truct绫诲瀷
-	yaml.Unmarshal(data, &c)
-	weedfsUrl = c.PhotoUrl
-	videoPersonUrl = c.VideoPersons
-	personAction = c.PersonAction
-}
+//func InitInsertEs() {
+//	weedfsUrl = "http://"+WeedFs.Ip+":"+strconv.Itoa(WeedFs.UploadPort)+"/submit"
+//	videoPersonUrl = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.VideoPersons.IndexName+"/"+EsInfo.EsIndex.VideoPersons.IndexType
+//	personAction = "http://"+EsInfo.Masterip+":"+EsInfo.Httpport+"/"+EsInfo.EsIndex.Personaction.IndexName+"/"+EsInfo.EsIndex.Personaction.IndexType
+//}
 
 // 浜鸿劯鐨勬暟鎹粨鏋�
 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"`
+	CameraName      string                `json:"cameraName"`
+	PicDate         string                `json:"picDate"`
+	PicMaxUrl       string                `json:"picMaxUrl"`
+	TaskId          string                `json:"taskId"`
+	TaskName        string                `json:"taskName"`
+	SdkName         string                `json:"sdkName"`
+	Content         string                `json:"content"`
+	AlarmRules      []AlarmRule           `json:"alarmRules"`
+	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        []*structure.BaseInfo `json:"baseInfo"`
+	TargetInfo      []Target              `json:"targetInfo"`
+	LinkTag         string                `json:"linkTag"`
+	LinkTagInfo     []*LinkInfo           `json:"linkTagInfo"`
+}
+
+type LinkInfo struct {
+	Id              string                `json:"id"`
+	CameraId        string                `json:"cameraId"`
+	CameraAddr      string                `json:"cameraAddr"`
+	CameraName      string                `json:"cameraName"`
+	PicDate         string                `json:"picDate"`
+	PicMaxUrl       string                `json:"picMaxUrl"`
+	TaskId          string                `json:"taskId"`
+	TaskName        string                `json:"taskName"`
+	SdkName         string                `json:"sdkName"`
+	Content         string                `json:"content"`
+	AlarmRules      []AlarmRule           `json:"alarmRules"`
+	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        []*structure.BaseInfo `json:"baseInfo"`
+	TargetInfo      []Target              `json:"targetInfo"`
+}
+
+type Target struct {
+	TargetId       string  `json:"targetId"`
+	TargetScore    float64 `json:"targetScore"`
+	TargetLocation Points  `json:"targetLocation"`
+}
+
+type Points struct {
+	TopLeft     Point `json:"topLeft"`
+	BottomRight Point `json:"bottomRight"`
+}
+
+type Point struct {
+	X float64 `json:"x"`
+	Y float64 `json:"y"`
 }
 
 //  yolo琛屼负鐨勬暟鎹粨鏋�
@@ -99,365 +146,514 @@
 	IsAckAlarm      int         `json:"isAckAlarm"`
 	IsCollect       int         `json:"isCollect"`
 	IsDelete        int         `json:"isDelete"`
+	TargetInfo      []Target    `json:"targetInfo"`
+	LinkTag         string      `json:"linkTag"`
+	LinkTagInfo     []*LinkInfo `json:"linkTagInfo"`
 }
 
 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"`
+	LinkInfo     string `json:"linkInfo"`
 }
 
-// 寰�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)
-		InsertYolo(msg)
-	}
-	if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
-		InsertFace(msg)
-		InsertYolo(msg)
+// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
+type FaceAndRules struct {
+	structure.Arg
+	rules []structure.Result
+}
 
+func InsertToEs(msg structure.ResultMsg) {
+	//defer func() {
+	//	if err := recover(); err != nil {
+	//		logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+	//	}
+	//}()
+	localConfig1, err := cache.GetServerInfo()
+	if err != nil {
+		panic("閰嶇疆鏂囦欢涓嶅悎娉�")
 	}
-	if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
-		//ChangeStatusFace(msg)
-		ChangeStatusYolo(msg)
-	}
+	weedfsUrl = "http://" + localConfig1.WebPicIp + ":" + strconv.Itoa(int(localConfig1.WebPicPort)) + "/submit"
+	videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
+	personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
+	InsertFace(msg)
+	InsertYolo(msg)
+	InsertTarget(msg)
 }
 
 // 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg) {
-	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
+func InsertFace(msg structure.ResultMsg) {
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0 {
 		logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
-		for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
-			// 涓婁紶澶у浘
-			// 瑙e帇缂╁苟涓婁紶鍥剧墖
-			bdata, err := util.UnCompress(msg.Data)
-			if err != nil {
-				panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
-			}
-			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)
+		faces := []*FaceAndRules{}
+		faces = PutFace(faces, msg)
+		//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+		if faces != nil {
+			var imgMaxUrl string = ""
+			var picTime string = ""
+			for _, face := range faces {
+				// 涓婁紶澶у浘
+				// 瑙e帇缂╁苟涓婁紶鍥剧墖
+				bdata, err := util.UnCompress(msg.Data)
+				if err != nil {
+					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+				}
+				alarmRules := []AlarmRule{}
+				//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, ""})
+				}
+				i := protomsg.Image{}
+				err = proto.Unmarshal(bdata, &i)
+				// 鍏堜紶灏忓浘锛屽啀浼犲ぇ鍥撅紝闃叉鑴镐笂鏈夌嚎
+				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("涓婁紶灏忓浘鍑洪敊")
+				}
+				// 涓婁紶澶у浘
+				if imgMaxUrl == "" {
+					bigPhotoUrl := make(map[string]interface{})
+					bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl)
+					logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+					imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
+					picTime = i.Timestamp
+				}
+				sex := ""
+				logger.Info(sex)
+				if face.ThftRes.Gender == 1 {
+					sex = "鐢�"
+				} else {
+					sex = "濂�"
+				}
+				race := getRaceString(face.ThftRes.Race)
+				ageDescription := getDescription(face.ThftRes.Age)
+				logger.Info(ageDescription)
+				var target = new(Target)
+				target.TargetId = strconv.FormatUint(face.Id, 10)
+				target.TargetScore = face.Score
+				target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
+				//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+				var targetInfos []Target
+				targetInfos = append(targetInfos, *target)
+				pervideo := PerVideoPicture{
+					face.Uuid,
+					msg.Cid,
+					msg.Push.Cam.Addr,
+					msg.Push.Cam.Name,
+					picTime,
+					imgMaxUrl,
+					msg.Tasklab.Taskid,
+					msg.Tasklab.Taskname,
+					"浜鸿劯",
+					time.Now().Format("2006-01-02 15:04:05"),
+					alarmRules,
+					time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+					sex,                                      //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
+					face.ThftRes.Age,
+					ageDescription, // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
+					race,
+					face.ThftRes.Smile,
+					face.ThftRes.Beauty,
+					base64.StdEncoding.EncodeToString(face.Feature),
+					[]string{resp["fileUrl"].(string)},
+					"",
+					msg.Push.ServerId,
+					msg.Push.ServerName,
+					msg.Push.LocalIp,
+					"",
+					face.Score,
+					1,
+					0,
+					0,
+					0,
+					face.Liker,
+					targetInfos,
+					"",
+					[]*LinkInfo{},
+				}
+				requstbody, err := json.Marshal(pervideo)
 
-			pervideo := PerVideoPicture{
-				uuid.NewV4().String(),
-				msg.Cid,
-				camera.Addr,
-				i.Timestamp,
-				strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
-				msg.Tasklab.Taskid,
-				msg.Tasklab.Taskname,
-				"浜鸿劯",
-				"",
-				time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
-				sex,
-				face.ThftRes.Age,
-				ageDescription,
-				race,
-				face.ThftRes.Smile,
-				face.ThftRes.Beauty,
-				string(face.Feature),
-				[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
-				"鏆傛棤闆嗙兢",
-				localConfig.ServerId,
-				localConfig.ServerName,
-				serverIp,
-				"",
-				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: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
+				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: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
+				}
 			}
 		}
 	}
 }
-func ChangeStatusFace(msg ruleserver.ResultMsg) {
-	logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
-	// 涓婁紶澶у浘
-	// 瑙e帇缂╁苟涓婁紶鍥剧墖
-	bdata, err := util.UnCompress(msg.Data)
-	if err != nil {
-		panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
-	}
-	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("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
-	}
 
-	pervideo := PerVideoPicture{
-		uuid.NewV4().String(),
-		msg.Cid,
-		camera.Addr,
-		i.Timestamp,
-		strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
-		msg.Tasklab.Taskid,
-		msg.Tasklab.Taskname,
-		"浜鸿劯",
-		"鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
-		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)
+// 褰掔疆浜鸿劯
+func PutFace(faces []*FaceAndRules, msg structure.ResultMsg) []*FaceAndRules {
+	if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0 {
+		for _, faceResult := range msg.RuleResult["face"].([]structure.Result) {
+			faces = hebingFace(faces, faceResult)
+		}
+		return faces
 	} 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{}})
+		return nil
 	}
-	//if msg.RuleResult["cacheData"] != nil {
-	//	InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
-	//}
+}
+func hebingFace(faces []*FaceAndRules, faceResult structure.Result) []*FaceAndRules {
+	for _, arg := range faceResult.AlarmObj {
+		// 鎷垮埌姣忎竴寮犱汉鑴�
+		//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)
+				// 鐩镐技鑰呭幓閲嶅綊骞�
+				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, []structure.Result{faceResult}})
+		}
+	}
+	return faces
 }
 
 // 寰�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.AlarmLevel)
-			alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+func InsertYolo(msg structure.ResultMsg) {
+	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
+		// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+		flag := false
+		for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
+			//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+			if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+				flag = true
+			}
 		}
-		isAlarm := 0
-		resp := make(map[string]interface{})
-		// 瑙e帇缂╁苟涓婁紶鍥剧墖
-		bdata, err := util.UnCompress(msg.Data)
-		if err != nil {
-			panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
-		}
-		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)
+		if flag {
+				logger.Info("寰�ES鎻抷olo鏁版嵁")
+				var sdkNames string = ""
+				alarmRules := []AlarmRule{}
+				var targetInfos []Target
+				url := []string{}
+				for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
+					if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
+						// 鎷煎嚭sdkname
+						//logger.Info("搴旇杩涙潵鎵嶅鐨�")
+						sdkNames = sdkNames + yoloResult.SdkName
+						alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+						linkInfo := ""
+						if yoloResult.IsLink {
+							linkInfo = "鑱斿姩浠诲姟"
+						}
+						alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
+						logger.Info("鎵撳嵃浠诲姟鍚嶇О锛�",)
+						// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
+						if yoloResult.Others.CacheData != nil {
+							//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+							// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+							// 瑙e帇缂╁苟涓婁紶鍥剧墖
+							msgs := yoloResult.Others.CacheData
+							for _, msg1 := range msgs {
+								bdata, err := util.UnCompress(msg1.Data)
+								if err != nil {
+									panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+								}
+								i := protomsg.Image{}
+								err = proto.Unmarshal(bdata, &i)
+								resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
+								if err1 != nil {
+									logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+								} else {
+									logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+								}
+								if resp1["fileUrl"] != nil {
+									url = append(url, resp1["fileUrl"].(string))
+								}
+							}
+						}
+						// 瑁呴厤鐩爣淇℃伅鏁版嵁
+						for _, target := range yoloResult.AlarmObj {
+							// 鍘婚噸娣诲姞
+							var flag = true
+							for _, selectTarget := range targetInfos {
+								if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId {
+									flag = false
+									break
+								}
+							}
+							if flag {
+								var target1 = new(Target)
+								target1.TargetId = strconv.FormatUint(target.Id, 10)
+								target1.TargetScore = target.Score
+								target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
+								targetInfos = append(targetInfos, *target1)
+							}
+						}
+					}
+				}
+				// 鑱斿姩鍥惧儚鐨勫鐞�
+				linkTagInfos := []*LinkInfo{}
+				for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
+					if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
+						for _, msg2 := range yoloResult.Others.LinkCache {
+							// 鎶妋sg2鐨勬暟鎹閰嶆垚涓�涓狿erVideoPicture缁撴瀯浣�
+							if msg2.Cid != msg.Cid {
+								linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2))
+							}
+						}
+					}
+				}
+				linkTag := ""
+				if len(linkTagInfos) > 0 {
+					linkTag = "鑱斿姩浠诲姟"
+				}
+				isAlarm := 0
+				resp := make(map[string]interface{})
+				// 瑙e帇缂╁苟涓婁紶鍥剧墖
+				bdata, err := util.UnCompress(msg.Data)
+				if err != nil {
+					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+				}
+				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.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
+					if err != nil {
+						logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+						return
+					} else {
+						logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+					}
+				} else {
+					isAlarm = 0
+					// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+					return
+				}
+				if resp["fileUrl"] != nil {
+					url = append(url, resp["fileUrl"].(string))
+					//esDataId := uuid.NewV4().String()
+					peraction := Personaction{
+						msg.Push.PushId,
+						msg.Cid,
+						msg.Push.Cam.Name,
+						msg.Push.Cam.Addr,
+						msg.Tasklab.Taskid,
+						msg.Tasklab.Taskname,
+						sdkNames,
+						time.Now().Format("2006-01-02 15:04:05"),
+						alarmRules,
+						msg.Push.ServerId,
+						msg.Push.ServerName,
+						msg.Push.LocalIp,
+						"",
+						url,
+						i.Timestamp,
+						"",
+						isAlarm,
+						0,
+						0,
+						0,
+						targetInfos,
+						linkTag,
+						linkTagInfos,
+					}
+					requstbody, err := json.Marshal(peraction)
+
+					if len(linkTagInfos)>0 {
+						logger.Info("鑱斿姩浠诲姟1111")
+					}
+					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杩斿洖鐨勬暟鎹俊鎭槸锛坹olo锛夛細", resp1)
+						// 鍙戝嚭褰曞儚淇″彿
+						ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
+						for index,link := range linkTagInfos {
+							logger.Info("鑱斿姩浠诲姟鐨勫綍鍍忎俊鍙凤細",index)
+							ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: link.CameraId, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{strconv.Itoa(index)}, Type: 2})
+						}
+						logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+						//os.Exit(1)
+					}
+				}
 			}
 		} 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()
-		if msg.RuleResult["cacheData"] != nil {
-			InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
-			// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
-			
-		}
-		peraction := Personaction{
-			uuid.NewV4().String(),
-			msg.Cid,
-			camera.Name,
-			camera.Addr,
-			msg.Tasklab.Taskid,
-			msg.Tasklab.Taskname,
-			sdkNames,
-			"",
-			alarmRules,
-			localConfig.ServerId,
-			localConfig.ServerName,
-			serverIp,
-			"",
-			[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
-			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: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
-			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("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
-	}
-	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()
-	peraction := Personaction{
-		uuid.NewV4().String(),
-		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: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}})
-		logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
-		//os.Exit(1)
+			logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
 	}
 }
 
+// 鎻掑叆鐩爣鎸佺画鏃堕棿鏁版嵁
+
+func InsertTarget(msg structure.ResultMsg) {
+	if msg.RuleResult["target"] != nil && len(msg.RuleResult["target"].([]structure.Result)) > 0 {
+		// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+		logger.Info("鎻掑叆瀹氭椂鐩爣淇℃伅锛�",len(msg.RuleResult["target"].([]structure.Result)))
+		for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
+			// 瑁呰浇鐩爣淇℃伅`
+			// 濡傛灉鏈夐娆℃姤璀︾殑鍒欐湰甯ф暟鎹彲浠ユ彃鍏�
+			insertFlag := false
+			alarmNum := 0
+			for _,obj := range yoloResult.AlarmObj {
+				if obj.TimeLable == "10" {
+					insertFlag = true
+					alarmNum++
+				}
+			}
+			if insertFlag {
+				logger.Info("鎶ヨ鐩爣涓暟锛�",alarmNum)
+				//var target = new(Target)
+				//target.TargetId = strconv.FormatUint(tar.Id, 10)
+				//target.TargetScore = tar.Score
+				//target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
+				//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+				//var targetInfos []Target
+				//targetInfos = append(targetInfos, *target)
+				// 鑾峰彇鐩爣缂撳瓨鍥剧墖
+				url := []string{}
+				//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+				// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+				// 瑙e帇缂╁苟涓婁紶鍥剧墖
+				url1 := uploadImg(yoloResult.AlarmObj[0].CacheData)
+				url = append(url,url1)
+				// 娣诲姞鎶ヨ瑙勫垯缁�
+				sdkNames := ""
+				alarmRules := []AlarmRule{}
+				sdkNames = sdkNames + yoloResult.SdkName
+				alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+				linkInfo := ""
+				if yoloResult.IsLink {
+					linkInfo = "鑱斿姩浠诲姟"
+				}
+				alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
+				// 鑱斿姩鍥惧儚鐨勫鐞�
+				linkTagInfos := []*LinkInfo{}
+				for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
+					if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
+						for _, msg2 := range yoloResult.Others.LinkCache {
+							// 鎶妋sg2鐨勬暟鎹閰嶆垚涓�涓狿erVideoPicture缁撴瀯浣�
+							if msg2.Cid != msg.Cid {
+								linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2))
+							}
+						}
+					}
+				}
+				linkTag := ""
+				if len(linkTagInfos) > 0 {
+					linkTag = "鑱斿姩浠诲姟"
+				}
+				isAlarm := 0
+				resp := make(map[string]interface{})
+				// 瑙e帇缂╁苟涓婁紶鏈抚鏁版嵁鍥剧墖
+				bdata1, err := util.UnCompress(msg.Data)
+				if err != nil {
+					panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+				}
+				i := protomsg.Image{}
+				err = proto.Unmarshal(bdata1, &i)
+				if len(alarmRules) > 0 {
+					isAlarm = 1
+					//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+					resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+					if err != nil {
+						logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+						return
+					} else {
+						logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+					}
+				} else {
+					isAlarm = 0
+					// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+					return
+				}
+				if resp["fileUrl"] != nil {
+					url = append(url, resp["fileUrl"].(string))
+					if len(url) == 1 {
+						return
+					}
+					//esDataId := uuid.NewV4().String()
+					peraction := Personaction{
+						msg.Push.PushId,
+						msg.Cid,
+						msg.Push.Cam.Name,
+						msg.Push.Cam.Addr,
+						msg.Tasklab.Taskid,
+						msg.Tasklab.Taskname,
+						sdkNames,
+						time.Now().Format("2006-01-02 15:04:05"),
+						alarmRules,
+						msg.Push.ServerId,
+						msg.Push.ServerName,
+						msg.Push.LocalIp,
+						"",
+						url,
+						i.Timestamp,
+						"",
+						isAlarm,
+						0,
+						0,
+						0,
+						nil,
+						linkTag,
+						linkTagInfos,
+					}
+					requstbody, err := json.Marshal(peraction)
+
+					if len(linkTagInfos)>0 {
+						logger.Info("鑱斿姩浠诲姟1111")
+					}
+					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杩斿洖鐨勬暟鎹俊鎭槸锛坱arget锛夛細", resp1)
+						// 鍙戝嚭褰曞儚淇″彿
+						ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
+						for index,link := range linkTagInfos {
+							logger.Info("鑱斿姩浠诲姟鐨勫綍鍍忎俊鍙凤細",index)
+							ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: link.CameraId, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{strconv.Itoa(index)}, Type: 2})
+						}
+						logger.Warn("__________________________________________寰�ES鎻掑叆target鏁版嵁鎴愬姛")
+						//os.Exit(1)
+					}
+				}
+			} else {
+				logger.Info("娌℃湁棣栨鎶ヨ鐨勭洰鏍囷紝涓嶆彃鍏�")
+			}
+		}
+	}
+}
 // 鑾峰彇鏈満ip
 func GetLocalIP() (ipv4 string, err error) {
 	var (
@@ -487,26 +683,50 @@
 }
 
 // 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string {
+func ChangeToString(defenceState bool, i int32) string {
 	alarm := ""
-	if i == 1 {
-		alarm = "涓�绾�"
+	if defenceState {
+		if i == 1 {
+			alarm = "涓�绾�"
+		}
+		if i == 2 {
+			alarm = "浜岀骇"
+		}
+		if i == 3 {
+			alarm = "涓夌骇"
+		}
+		if i == 4 {
+			alarm = "鍥涚骇"
+		}
+		if i == 5 {
+			alarm = "浜旂骇"
+		}
+	} else {
+		alarm = "鎾ら槻"
 	}
-	if i == 2 {
-		alarm = "浜岀骇"
-	}
-	if i == 3 {
-		alarm = "涓夌骇"
-	}
-	if i == 4 {
-		alarm = "鍥涚骇"
-	}
-	if i == 5 {
-		alarm = "浜旂骇"
-	}
+
 	return alarm
 }
 
+func uploadImg(msg structure.ResultMsg) string{
+	bdata, err := util.UnCompress(msg.Data)
+	if err != nil {
+		panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+	}
+	i := protomsg.Image{}
+	err = proto.Unmarshal(bdata, &i)
+	resp1, err1 := util.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+	if err1 != nil {
+		logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+	} else {
+		logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+	}
+	if resp1["fileUrl"] != nil {
+		return resp1["fileUrl"].(string)
+	} else {
+		return ""
+	}
+}
 //鑾峰彇骞撮緞鎻忚堪
 func getDescription(age int32) string {
 	ageInfo := "闈掑勾"
@@ -535,3 +755,148 @@
 	}
 	return race
 }
+
+func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
+	if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
+		// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+		flag := false
+		for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
+			//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+			if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+				flag = true
+			}
+		}
+		if flag {
+			logger.Info("鎻掑叆Yolo缁勮鏁版嵁")
+			var sdkNames string = ""
+			alarmRules := []AlarmRule{}
+			var targetInfos []Target
+			url := []string{}
+			for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
+				if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
+					// 鎷煎嚭sdkname
+					//logger.Info("搴旇杩涙潵鎵嶅鐨�")
+					sdkNames = sdkNames + yoloResult.SdkName
+					alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+					linkInfo := ""
+					if yoloResult.IsLink {
+						linkInfo = "鑱斿姩浠诲姟"
+					}
+					alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
+					// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
+					if yoloResult.Others.CacheData != nil {
+						//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+						// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+						// 瑙e帇缂╁苟涓婁紶鍥剧墖
+						msgs := yoloResult.Others.CacheData
+						for _, msg1 := range msgs {
+							bdata, err := util.UnCompress(msg1.Data)
+							if err != nil {
+								panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+							}
+							i := protomsg.Image{}
+							err = proto.Unmarshal(bdata, &i)
+							resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
+							if err1 != nil {
+								logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+							} else {
+								logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+							}
+							if resp1["fileUrl"] != nil {
+								url = append(url, resp1["fileUrl"].(string))
+							}
+						}
+					}
+					// 瑁呴厤鐩爣淇℃伅鏁版嵁
+					for _, target := range yoloResult.AlarmObj {
+						// 鍘婚噸娣诲姞
+						var flag = true
+						for _, selectTarget := range targetInfos {
+							if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId {
+								flag = false
+								break
+							}
+						}
+						if flag {
+							var target1 = new(Target)
+							target1.TargetId = strconv.FormatUint(target.Id, 10)
+							target1.TargetScore = target.Score
+							target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
+							targetInfos = append(targetInfos, *target1)
+						}
+					}
+				}
+			}
+			isAlarm := 0
+			resp := make(map[string]interface{})
+			// 瑙e帇缂╁苟涓婁紶鍥剧墖
+			bdata, err := util.UnCompress(msg.Data)
+			if err != nil {
+				panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒")
+			}
+			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.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
+				if err != nil {
+					logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+					return nil
+				} else {
+					logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+				}
+			} else {
+				isAlarm = 0
+				// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+				return nil
+			}
+			if resp["fileUrl"] != nil {
+				url = append(url, resp["fileUrl"].(string))
+				//esDataId := uuid.NewV4().String()
+				pervideo := &LinkInfo{
+					msg.Push.PushId + "-" + uuid.NewV4().String(),
+					msg.Cid,
+					msg.Push.Cam.Addr,
+					msg.Push.Cam.Name,
+					i.Timestamp,
+					"",
+					msg.Tasklab.Taskid,
+					msg.Tasklab.Taskname,
+					"浜鸿劯",
+					"",
+					alarmRules,
+					time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+					"",                                       //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
+					0,
+					"", // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
+					"",
+					0,
+					0,
+					"",
+					[]string{resp["fileUrl"].(string)},
+					"",
+					msg.Push.ServerId,
+					msg.Push.ServerName,
+					msg.Push.LocalIp,
+					"",
+					0,
+					isAlarm,
+					0,
+					0,
+					0,
+					nil,
+					targetInfos,
+				}
+				return pervideo
+			} else {
+				return nil
+			}
+		} else {
+			logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
+			return nil
+		}
+	} else {
+		return nil
+	}
+}

--
Gitblit v1.8.0