From 5a9ed312168e352e348474405163de7054070836 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 08 八月 2019 17:19:00 +0800
Subject: [PATCH] ---
---
main.go | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/main.go b/main.go
index ac36ce2..ee552ea 100644
--- a/main.go
+++ b/main.go
@@ -4,20 +4,21 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "bufio"
- "bytes"
+ "ruleprocess/insertdata"
+ "ruleprocess/util"
+
+ //"bufio"
+ //"bytes"
"flag"
"fmt"
- "ruleprocess/logger"
"github.com/golang/protobuf/proto"
- "gocv.io/x/gocv"
- "image"
- "image/color"
- "os"
+ "ruleprocess/logger"
+ //"gocv.io/x/gocv"
+ //"image"
+ //"image/color"
+ //"os"
"ruleprocess/cache"
"ruleprocess/ruleserver"
- "ruleprocess/util"
- "ruleprocess/insertdata"
"sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -40,15 +41,11 @@
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
-
+ ruleserver.Init()
go ruleserver.TimeTicker()
+ go ruleserver.StartServer()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
- //resp,err := DrawPolygonOnImage()
- //if err != nil {
- // logger.Println("鐢绘鎴栬�呬笂浼犳湁闂")
- //}
- //logger.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -72,15 +69,16 @@
continue
} else {
arg := ruleserver.SdkDatas{}
+ //paramFormat(msg, &arg)
m := paramFormat(msg, &arg)
- //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.Judge(&arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+ ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- //logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
-
+ resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMag)
+ insertdata.InsertToEs(resultMsg)
+ //浜嬩欢鎺ㄩ��
+ //go labelFilter.Judge(resultMsg)
}
}
}
@@ -88,6 +86,7 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
+ //logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
rect := ruleserver.Rect{}
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
@@ -110,7 +109,11 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+
+ // 鍏堣繘琛屼竴涓嬭拷韪�
+ //ruleserver.FaceIsSame(&m)
args.CameraId = m.Cid
+ args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -118,6 +121,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細",m.Cid,"鍥剧墖鐨刬d涓猴細",i.Id)
//logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
@@ -125,17 +129,18 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //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
+ logger.Info("-----杩借釜涔嬪悗sdkinfo.Sdkdata鐨勯暱搴︿负锛�----",len(sdkinfo.Sdkdata))
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
yoloParam := protomsg.ParamYoloObj{}
@@ -144,13 +149,16 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+ var yoloNum int = 0
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
+ //logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
arg.Photo = append(arg.Photo, photoMap)
+ yoloNum++
}
}
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",yoloNum)
args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
@@ -162,12 +170,12 @@
arg.TaskId = m.Tasklab.Taskid
arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
+ //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杩樻病鏈夎繖淇╃畻娉�
@@ -180,9 +188,10 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
+ //logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+ photoMap := ruleserver.PhotoMap{Id:info.Pos.FaceID,Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
--
Gitblit v1.8.0