From 777f3e442294132e15b15e49b3e95ba72695cc7c Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 17:45:49 +0800
Subject: [PATCH] 补全比对规则
---
main.go | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/main.go b/main.go
index e5ba801..e0acdeb 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,7 @@
"bytes"
"flag"
"fmt"
+ "ruleprocess/logger"
"github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
@@ -16,7 +17,6 @@
"ruleprocess/cache"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "ruleprocess/logger"
"ruleprocess/insertdata"
"sync"
)
@@ -26,13 +26,9 @@
var pubPort = flag.Int("pubPort",50007,"pubsub port") //鏁版嵁鏇存柊
var initchan = make(chan bool)
func init () {
- var logFile = "./info.log"
- var logSaveDays = 15
-
// 鏃ュ織鍒濆鍖�
- logger.Config(logFile, logger.DebugLevel)
- logger.SetSaveDays(logSaveDays)
- logger.Info("loginit success !")
+ logger.Config("./info.log", logger.DebugLevel)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
}
func main() {
@@ -77,7 +73,7 @@
} else {
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
- logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
@@ -127,8 +123,7 @@
if sdkinfo.Sdktype == "Yolo" {
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -149,7 +144,7 @@
logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
+ //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
@@ -165,8 +160,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -186,7 +180,7 @@
logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",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)*100, IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
--
Gitblit v1.8.0