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 | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/main.go b/main.go
index 43b93b7..d6a9bdf 100644
--- a/main.go
+++ b/main.go
@@ -40,7 +40,7 @@
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()
@@ -105,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 {
@@ -139,14 +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)
+ //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
@@ -176,9 +181,9 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+ //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)
}
--
Gitblit v1.8.0