From 3fcf9c2063d8a88b6086896e99cea176748c5ef1 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 15:38:42 +0800
Subject: [PATCH] 改造init方法
---
main.go | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/main.go b/main.go
index ac36ce2..d6a9bdf 100644
--- a/main.go
+++ b/main.go
@@ -4,16 +4,16 @@
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
- "bufio"
- "bytes"
+ //"bufio"
+ //"bytes"
"flag"
"fmt"
"ruleprocess/logger"
"github.com/golang/protobuf/proto"
- "gocv.io/x/gocv"
- "image"
- "image/color"
- "os"
+ //"gocv.io/x/gocv"
+ //"image"
+ //"image/color"
+ //"os"
"ruleprocess/cache"
"ruleprocess/ruleserver"
"ruleprocess/util"
@@ -40,15 +40,10 @@
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
-
+ ruleserver.Init()
go ruleserver.TimeTicker()
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)
@@ -74,9 +69,9 @@
arg := ruleserver.SdkDatas{}
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}
+ resultMag := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
//logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
@@ -110,7 +105,10 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
+ // 鍏堣繘琛屼竴涓嬭拷韪�
+ ruleserver.IsSame(&m)
args.CameraId = m.Cid
+ args.TaskId = m.Tasklab.Taskid
// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -144,13 +142,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鐨勪釜鏁帮細",len(yoloParam.Infos))
args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
@@ -180,9 +181,10 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",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{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