panlei
2019-06-22 b2dbeaa7eb8ce43bc0b7553b49e9e4c7c342135d
过滤数据长度
1个文件已修改
63 ■■■■■ 已修改文件
main.go 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.go
@@ -2,13 +2,13 @@
import (
    "fmt"
    "ruleprocess/ruleserver"
    "ruleprocess/insertdata"
    "ruleprocess/ruleserver"
    "sync"
    "basic.com/pubsub/protomsg.git"
    "basic.com/valib/deliver.git"
    "github.com/golang/protobuf/proto"
    "sync"
)
func main() {
@@ -39,8 +39,8 @@
                continue
            } else {
                arg := ruleserver.ArgsFromSdk{}
                m := paramFormat(msg,&arg)
                fmt.Println("解析出来的数据:",arg)
                m := paramFormat(msg, &arg)
                fmt.Println("解析出来的数据:", arg)
                ruleserver.MainJudge(&arg)
                // 把arg里的打的标签拿出来给m再封装一层
                resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
@@ -54,10 +54,10 @@
}
// 将外部传进来的sdk数据包解成 ArgsFromSdk
func paramFormat(msg []byte,arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
    defer func() {
        if err := recover();err != nil{
            fmt.Println("解包过程的错误",err.(string))
        if err := recover(); err != nil {
            fmt.Println("解包过程的错误", err.(string))
        }
    }()
@@ -69,7 +69,7 @@
    }
    arg.CameraId = m.Cid
    arg.TaskId = m.Tasklab.Taskid
    bdata,err := UnCompress(m.Data)
    bdata, err := UnCompress(m.Data)
    if err != nil {
        panic("解压缩图片时出现错误")
    }
@@ -83,28 +83,39 @@
    fmt.Println("从mongos中拿到的数据包长度为:", len(msg))
    for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo算法
        if sdkinfo.Sdktype == "Yolo" {
            yoloParam := protomsg.ParamYoloObj{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
            if err != nil {
                fmt.Println("解析YOLO sdk数据时出现错误", err)
                //continue
            }
            for _, info := range yoloParam.Infos {
                photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj), Score: float64(info.Prob)}
                arg.Photo = append(arg.Photo, photoMap)
            fmt.Println("数据长度为:", len(sdkinfo.Sdkdata))
            if len(sdkinfo.Sdkdata) > 1 {
                // 大于1才有数据
                yoloParam := protomsg.ParamYoloObj{}
                err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
                if err != nil {
                    fmt.Println("解析YOLO sdk数据时出现错误", err)
                    //continue
                }
                for _, info := range yoloParam.Infos {
                    photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
                    arg.Photo = append(arg.Photo, photoMap)
                }
            } else {
                continue
            }
        }
        if sdkinfo.Sdktype == "FaceDetect" { // 人脸检测
            faceParam := protomsg.ParamFacePos{}
            err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
            if err != nil {
                fmt.Println("解析FACE sdk数据时出现错误", err)
            fmt.Println("数据长度为:", len(sdkinfo.Sdkdata))
            if len(sdkinfo.Sdkdata) > 1 {
                faceParam := protomsg.ParamFacePos{}
                err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
                if err != nil {
                    fmt.Println("解析FACE sdk数据时出现错误", err)
                    continue
                }
                for _, info := range faceParam.Faces {
                    photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
                    arg.Photo = append(arg.Photo, photoMap)
                }
            } else {
                continue
            }
            for _, info := range faceParam.Faces {
                photoMap := ruleserver.PhotoMap{Rects:ruleserver.Rect{-1,-1,-1,-1}, Score: float64(info.Pos.Quality)}
                arg.Photo = append(arg.Photo, photoMap)
            }
        }
        //if sdkinfo.Sdktype == "FaceExtract" { // 人脸提取
@@ -118,7 +129,7 @@
// 将外部传进来的rect(top,bottom,left,right)转化为自己内部的rect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
    rect := ruleserver.Rect{}
    fmt.Println("看一下传入的矩形数据:",rcobj.Left,rcobj.Top,rcobj.Right,rcobj.Bottom)
    fmt.Println("看一下传入的矩形数据:", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
    rect.X = float64(rcobj.Left)
    rect.Y = float64(rcobj.Top)
    rect.Width = float64(rcobj.Right - rcobj.Left)