From b1003246e0c3bd5e00a2419c9b21868bcf6d7326 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 14:06:46 +0800
Subject: [PATCH] 再改占比
---
main.go | 90 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/main.go b/main.go
index 64321ca..e148dff 100644
--- a/main.go
+++ b/main.go
@@ -2,12 +2,14 @@
import (
"fmt"
+ "ruleprocess/insertdata"
"ruleprocess/ruleserver"
- "sync"
+ "ruleprocess/util"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
"github.com/golang/protobuf/proto"
+ "sync"
)
func main() {
@@ -38,60 +40,102 @@
continue
} else {
arg := ruleserver.ArgsFromSdk{}
- m := paramFormat(msg,&arg)
- arg.MainJudge()
+ m := paramFormat(msg, &arg)
+ fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ ruleserver.MainJudge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+
+ // 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+ insertdata.InsertToEs(resultMag)
}
}
}
}
// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� 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))
+ }
+
+ }()
// 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
m := protomsg.SdkMessage{}
err := proto.Unmarshal(msg, &m)
if err != nil {
- fmt.Println("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�", err)
- return m
+ panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
arg.CameraId = m.Cid
arg.TaskId = m.Tasklab.Taskid
-
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
i := protomsg.Image{}
- err = proto.Unmarshal(m.Data, &i)
+ err = proto.Unmarshal(bdata, &i)
arg.ImageWidth = int(i.Width)
arg.ImageHeight = int(i.Height)
// 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
arg.KeepRight = false
arg.IsStatic = false
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
- for _, sdkinfo := range m.Tasklab.Sdkinfos {
- if sdkinfo.Sdktype == "yolo" {
- yoloParam := protomsg.ParamYoloObj{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
+ if sdkinfo.Sdktype == "Yolo" {
+ if len(sdkinfo.Sdkdata) > 1 {
+ // 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Caddr)
+ yoloParam := protomsg.ParamYoloObj{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ //continue
+ }
+ for _, info := range yoloParam.Infos {
+ if info.Typ == 0 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ }
+ } else {
continue
- }
- for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects:rectFormat(info.RcObj, i.Width, i.Height), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
}
}
+ //if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ // fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ // if len(sdkinfo.Sdkdata) > 1 {
+ // fmt.Println("----------------------------------------------------",m.Caddr)
+ // 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
+ // }
+ //}
+ //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+
+ //}
+
}
return m
}
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect, width int32, height int32) ruleserver.Rect {
+func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
rect := ruleserver.Rect{}
+ fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
- rect.Width = float64(width - rcobj.Left - rcobj.Right)
- rect.Height = float64(height - rcobj.Top - rcobj.Bottom)
+ rect.Width = float64(rcobj.Right - rcobj.Left)
+ rect.Height = float64(rcobj.Bottom - rcobj.Top)
return rect
}
--
Gitblit v1.8.0