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 | 149 +++++++++++++++++++++++++++----------------------
1 files changed, 82 insertions(+), 67 deletions(-)
diff --git a/main.go b/main.go
index 30eb6f9..e0acdeb 100644
--- a/main.go
+++ b/main.go
@@ -8,16 +8,16 @@
"bytes"
"flag"
"fmt"
+ "ruleprocess/logger"
"github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
"image/color"
- "log"
"os"
"ruleprocess/cache"
- "ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
+ "ruleprocess/insertdata"
"sync"
)
var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
@@ -25,23 +25,30 @@
var surveyPort = flag.Int("surveyPort",40007,"survey port") //蹇冭烦
var pubPort = flag.Int("pubPort",50007,"pubsub port") //鏁版嵁鏇存柊
var initchan = make(chan bool)
+func init () {
+ // 鏃ュ織鍒濆鍖�
+ logger.Config("./info.log", logger.DebugLevel)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+
+}
func main() {
flag.Parse()
wg := sync.WaitGroup{}
- wg.Add(1)
+ wg.Add(2)
dbapi.Init(*dbIp,*dbPort)
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
- fmt.Println("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ //fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
go ruleserver.TimeTicker()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
//resp,err := DrawPolygonOnImage()
//if err != nil {
- // log.Println("鐢绘鎴栬�呬笂浼犳湁闂")
+ // logger.Println("鐢绘鎴栬�呬笂浼犳湁闂")
//}
- //log.Println(resp["fileUrl"].(string))
+ //logger.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -60,16 +67,17 @@
default:
msg, err = c.Recv()
if err != nil {
+ logger.Info("recv error : ", err)
fmt.Println("recv error : ", err)
continue
} else {
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ //logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMag)
@@ -92,7 +100,7 @@
func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ logger.Info("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
}
}()
@@ -110,13 +118,12 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
+ //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
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 {
@@ -134,10 +141,10 @@
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
- log.Println("--------------------鐪嬬湅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}
@@ -153,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 {
@@ -168,15 +174,15 @@
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 {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ 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)}
+ 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)
}
args.Sdkdata = append(args.Sdkdata,&arg)
@@ -184,46 +190,55 @@
continue
}
}
- if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
- 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.ParamFaceFeature{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _, extComp := range faceParam.ExtComp {
- baseinfos := protomsg.Binfos{}
- err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
- if err1 != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
- arg.Photo = append(arg.Photo, photoMap)
- }
- args.Sdkdata = append(args.Sdkdata,&arg)
- } else {
- continue
- }
- }
+ //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
+ // 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 {
+ // faceParam := protomsg.ParamFaceFeature{}
+ // err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // for _,faceExtCom := range faceParam.ExtComp {
+ // binfos := protomsg.Binfos{}
+ // err := proto.Unmarshal(faceExtCom.Comp, &binfos)
+ // if err != nil {
+ // logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos.Infos[0].CompareScore)
+ // }
+ // logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
+ // for _, extComp := range faceParam.ExtComp {
+ // baseinfos := protomsg.Binfos{}
+ // err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
+ // if err1 != nil {
+ // logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // continue
+ // }
+ // photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
+ // args.Sdkdata = append(args.Sdkdata,&arg)
+ // } else {
+ // continue
+ // }
+ //}
}
return m
@@ -235,7 +250,7 @@
//imgs := gocv.NewMat()
ddd, err := RetrieveROM("./105.jpg")
if err != nil {
- fmt.Println("瑙ｇ爜鏈夎",err)
+ logger.Info("瑙ｇ爜鏈夎",err)
}
bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, bbb.Bytes())
@@ -271,7 +286,7 @@
//client := &http.Client{Timeout: timeout}
//resp, err := client.Do(request)
//if err != nil {
- // log.Fatal(err)
+ // logger.Fatal(err)
// return nil, err
//}
//defer func() {
@@ -280,11 +295,11 @@
// msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
// if _, ok := r.(error); ok {
// msg = r.(error).Error()
- // fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ // logger.Info("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
// }
// if _, ok := r.(string); ok {
// msg = r.(string)
- // fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ // logger.Info("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
// }
// err0 = errors.New(msg)
// }
@@ -294,11 +309,11 @@
// body := &bytes.Buffer{}
// _, err := body.ReadFrom(resp.Body)
// if err != nil {
- // log.Fatal(err)
+ // logger.Fatal(err)
// }
- // fmt.Println(resp.StatusCode)
- // //fmt.Println(resp.Header)
- // fmt.Println(body)
+ // logger.Info(resp.StatusCode)
+ // //logger.Info(resp.Header)
+ // logger.Info(body)
// //decoder := json.NewDecoder(strings.NewReader(body.String()))
// decoder := make(map[string]interface{})
// if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
--
Gitblit v1.8.0