派生自 ruleprocess
insertdata/insertDataToEs.go
@@ -70,7 +70,42 @@ BaseInfo []*structure.BaseInfo `json:"baseInfo"` TargetInfo []Target `json:"targetInfo"` LinkTag string `json:"linkTag"` LinkTagInfo []*PerVideoPicture `json:"linkTagInfo"` 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 { @@ -91,29 +126,29 @@ // yolo行为的数据结构 type Personaction struct { Id string `json:"id"` CameraId string `json:"cameraId"` CameraName string `json:"cameraName"` CameraAddr string `json:"cameraAddr"` TaskId string `json:"taskId"` TaskName string `json:"taskName"` SdkName string `json:"sdkName"` Content string `json:"content"` AlarmRules []AlarmRule `json:"alarmRules"` AnalyServerId string `json:"analyServerId"` AnalyServerName string `json:"analyServerName"` AnalyServerIp string `json:"analyServerIp"` ClusterId string `json:"clusterId"` PicSmUrl []string `json:"picSmUrl"` PicDate string `json:"picDate"` VideoUrl string `json:"videoUrl"` IsAlarm int `json:"isAlarm"` IsAckAlarm int `json:"isAckAlarm"` IsCollect int `json:"isCollect"` IsDelete int `json:"isDelete"` TargetInfo []Target `json:"targetInfo"` LinkTag string `json:"linkTag"` LinkTagInfo []*PerVideoPicture `json:"linkTagInfo"` Id string `json:"id"` CameraId string `json:"cameraId"` CameraName string `json:"cameraName"` CameraAddr string `json:"cameraAddr"` TaskId string `json:"taskId"` TaskName string `json:"taskName"` SdkName string `json:"sdkName"` Content string `json:"content"` AlarmRules []AlarmRule `json:"alarmRules"` AnalyServerId string `json:"analyServerId"` AnalyServerName string `json:"analyServerName"` AnalyServerIp string `json:"analyServerIp"` ClusterId string `json:"clusterId"` PicSmUrl []string `json:"picSmUrl"` PicDate string `json:"picDate"` VideoUrl string `json:"videoUrl"` IsAlarm int `json:"isAlarm"` 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 { @@ -131,11 +166,11 @@ } func InsertToEs(msg structure.ResultMsg) { defer func() { if err := recover(); err != nil { logger.Error("es模块儿的异常捕获：", err) } }() //defer func() { // if err := recover(); err != nil { // logger.Error("es模块儿的异常捕获：", err) // } //}() localConfig1, err := cache.GetServerInfo() if err != nil { panic("配置文件不合法") @@ -145,11 +180,12 @@ 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 structure.ResultMsg) { if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 { if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0 { logger.Info("往ES插人脸数据") faces := []*FaceAndRules{} faces = PutFace(faces, msg) @@ -181,7 +217,7 @@ // 上传大图 if imgMaxUrl == "" { bigPhotoUrl := make(map[string]interface{}) bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.FaceResult), weedfsUrl) bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl) logger.Debug("========大图路径：", bigPhotoUrl) imgMaxUrl = bigPhotoUrl["fileUrl"].(string) picTime = i.Timestamp @@ -213,7 +249,7 @@ 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, //暂改为人脸id strconv.FormatUint(face.Id, 10) @@ -237,7 +273,7 @@ face.Liker, targetInfos, "", []*PerVideoPicture{}, []*LinkInfo{}, } requstbody, err := json.Marshal(pervideo) @@ -251,7 +287,7 @@ } 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{}, Type: 1}) 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}) } } } @@ -260,8 +296,8 @@ // 归置人脸 func PutFace(faces []*FaceAndRules, msg structure.ResultMsg) []*FaceAndRules { if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 { for _, faceResult := range msg.RuleResult["face"].([]structure.FaceResult) { 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 @@ -269,8 +305,8 @@ return nil } } func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules { for _, arg := range faceResult.Args { func hebingFace(faces []*FaceAndRules, faceResult structure.Result) []*FaceAndRules { for _, arg := range faceResult.AlarmObj { // 拿到每一张人脸 //logger.Info("归置人脸时相似者的数量：", len(arg.Liker)) flag := false @@ -280,7 +316,7 @@ //} if arg.Id == face.Id { flag = true face.rules = append(face.rules, faceResult.Result) face.rules = append(face.rules, faceResult) // 相似者去重归并 for _, liker := range arg.Liker { flag1 := true @@ -297,7 +333,7 @@ } } if !flag { faces = append(faces, &FaceAndRules{arg, []structure.Result{faceResult.Result}}) faces = append(faces, &FaceAndRules{*arg, []structure.Result{faceResult}}) } } return faces @@ -315,155 +351,309 @@ } } if flag { logger.Info("往ES插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}) // 上传缓存数据的图片拿到url 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.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)) logger.Info("往ES插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}) logger.Info("打印任务名称：",) // 上传缓存数据的图片拿到url 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.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.Location { // 去重添加 var flag = true for _, selectTarget := range targetInfos { if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId { flag = false break // 装配目标信息数据 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.TargetId, 10) target1.TargetScore = target.TargetScore target1.TargetLocation = Points{TopLeft: Point{target.X, target.Y}, BottomRight: Point{target.X + target.Width, target.Y + target.Height}} targetInfos = append(targetInfos, *target1) 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 := []*PerVideoPicture{} 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 { // 把msg2的数据装配成一个PerVideoPicture结构体 linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2)) // 联动图像的处理 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 { // 把msg2的数据装配成一个PerVideoPicture结构体 if msg2.Cid != msg.Cid { linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2)) } } } } } linkTag := "" if len(linkTagInfos) > 0 { linkTag = "联动任务" } 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.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl) linkTag := "" if len(linkTagInfos) > 0 { linkTag = "联动任务" } isAlarm := 0 resp := make(map[string]interface{}) // 解压缩并上传图片 bdata, err := util.UnCompress(msg.Data) if err != nil { logger.Error("画框或上传图片服务器出错", err) return 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.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl) if err != nil { logger.Error("画框或上传图片服务器出错", err) return } else { logger.Info("上传的图片信息：", resp) } } 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, "", 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 err != nil { logger.Info("json parse error ", err) isAlarm = 0 // 不是报警数据不存 return } resp1, err2 := EsReq("POST", personAction, requstbody) if err2 != nil { logger.Error("往ES插入数据失败", err) } else { logger.Debug("插入es返回的数据信息是（yolo）：", 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{}, Type: 2}) logger.Warn("__________________________________________往ES插入yolo数据成功") //os.Exit(1) 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返回的数据信息是（yolo）：", 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 { 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("人脸的id:",strconv.FormatUint(face.Id, 10)) //var targetInfos []Target //targetInfos = append(targetInfos, *target) // 获取目标缓存图片 url := []string{} //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg)) // 把缓存的数据上传后得到地址存进去 // 解压缩并上传图片 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 { // 把msg2的数据装配成一个PerVideoPicture结构体 if msg2.Cid != msg.Cid { linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2)) } } } } linkTag := "" if len(linkTagInfos) > 0 { linkTag = "联动任务" } isAlarm := 0 resp := make(map[string]interface{}) // 解压缩并上传本帧数据图片 bdata1, err := util.UnCompress(msg.Data) if err != nil { panic("解压缩图片时出现错误") } 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返回的数据信息是（target）：", 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 ( @@ -518,6 +708,25 @@ return alarm } func uploadImg(msg structure.ResultMsg) string{ bdata, err := util.UnCompress(msg.Data) if err != nil { panic("解压缩图片时出现错误") } 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 := "青年" @@ -547,7 +756,7 @@ return race } func msg2PersonVideo(msg structure.ResultMsg) *PerVideoPicture { func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo { if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 { // 先判断一下数据带的规则标签是否有可以插入的 flag := false @@ -599,20 +808,20 @@ } } // 装配目标信息数据 for _, target := range yoloResult.Location { for _, target := range yoloResult.AlarmObj { // 去重添加 var flag = true for _, selectTarget := range targetInfos { if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId { if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId { flag = false break } } if flag { var target1 = new(Target) target1.TargetId = strconv.FormatUint(target.TargetId, 10) target1.TargetScore = target.TargetScore target1.TargetLocation = Points{TopLeft: Point{target.X, target.Y}, BottomRight: Point{target.X + target.Width, target.Y + target.Height}} 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) } } @@ -645,7 +854,7 @@ if resp["fileUrl"] != nil { url = append(url, resp["fileUrl"].(string)) //esDataId := uuid.NewV4().String() pervideo := &PerVideoPicture{ pervideo := &LinkInfo{ msg.Push.PushId + "-" + uuid.NewV4().String(), msg.Cid, msg.Push.Cam.Addr, @@ -678,8 +887,6 @@ 0, nil, targetInfos, "", []*PerVideoPicture{}, } return pervideo } else {
