From 07bbfda72c30dab7200246d08c4a9557c7e988a2 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 29 六月 2019 13:48:00 +0800
Subject: [PATCH] 规则库大版本升级
---
main.go | 167 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 132 insertions(+), 35 deletions(-)
diff --git a/main.go b/main.go
index a5fc975..030d6de 100644
--- a/main.go
+++ b/main.go
@@ -4,6 +4,7 @@
"fmt"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
+ "ruleprocess/util"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -38,10 +39,10 @@
fmt.Println("recv error : ", err)
continue
} else {
- arg := ruleserver.ArgsFromSdk{}
+ arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.MainJudge(&arg)
+ ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
//fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
@@ -54,7 +55,91 @@
}
// 灏嗗閮ㄤ紶杩涙潵鐨剆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 {
+// 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(bdata, &i)
+// arg.ImageWidth = int(i.Width)
+// arg.ImageHeight = int(i.Height)
+// // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+// arg.KeepRight = false
+// arg.IsStatic = false
+// 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,IsYolo:true}
+// arg.Photo = append(arg.Photo, photoMap)
+// }
+// }
+// } else {
+// continue
+// }
+//
+// }
+// if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+// 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: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality), IsYolo:false,ThftRes:*(info.Result)}
+// 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) ruleserver.Rect {
+ rect := ruleserver.Rect{}
+ rect.X = float64(rcobj.Left)
+ rect.Y = float64(rcobj.Top)
+ rect.Width = float64(rcobj.Right - rcobj.Left)
+ rect.Height = float64(rcobj.Bottom - rcobj.Top)
+ return rect
+}
+
+// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
+func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
@@ -67,43 +152,65 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- arg.CameraId = m.Cid
- arg.TaskId = m.Tasklab.Taskid
- bdata, err := UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- 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))
+ args.CameraId = m.Cid
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = true
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
+ fmt.Println("----------------------------------------------------",m.Cid)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
+ continue
}
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ if info.Typ == 0 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
}
+ args.Sdkdata = append(args.Sdkdata,arg)
} else {
continue
}
}
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ arg := ruleserver.SdkData{}
+ arg.TaskId = m.Tasklab.Taskid
+ arg.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ arg.IsYolo = false
+ bdata, err := util.UnCompress(m.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
+ fmt.Println("----------------------------------------------------",m.Caddr)
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
@@ -111,9 +218,10 @@
continue
}
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
arg.Photo = append(arg.Photo, photoMap)
}
+ args.Sdkdata = append(args.Sdkdata,arg)
} else {
continue
}
@@ -124,15 +232,4 @@
}
return m
-}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-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(rcobj.Right - rcobj.Left)
- rect.Height = float64(rcobj.Bottom - rcobj.Top)
- return rect
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0