From ac1025d5c2ef0983c0f48bffcb1ee7cee580c6b5 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 13:26:32 +0800
Subject: [PATCH] 查找底库人员
---
main.go | 190 +++++++++++++++++++++++++++++++----------------
1 files changed, 126 insertions(+), 64 deletions(-)
diff --git a/main.go b/main.go
index 09df1b6..f3860b1 100644
--- a/main.go
+++ b/main.go
@@ -1,21 +1,49 @@
package main
import (
- "fmt"
- "ruleprocess/insertdata"
- "ruleprocess/ruleserver"
- "ruleprocess/util"
-
+ "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ "ruleprocess/insertdata"
+ "ruleprocess/util"
+
+ //"bufio"
+ //"bytes"
+ "flag"
+ "fmt"
"github.com/golang/protobuf/proto"
+ "ruleprocess/logger"
+ //"gocv.io/x/gocv"
+ //"image"
+ //"image/color"
+ //"os"
+ "ruleprocess/cache"
+ "ruleprocess/ruleserver"
"sync"
)
+var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
+var dbPort = flag.Int("dbPort",8001,"default dbPort=8001")
+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)
+ 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()
}
@@ -36,29 +64,42 @@
default:
msg, err = c.Recv()
if err != nil {
+ logger.Info("recv error : ", err)
fmt.Println("recv error : ", err)
continue
} else {
- arg := ruleserver.ArgsFromSdk{}
+ arg := ruleserver.SdkDatas{}
+ //paramFormat(msg, &arg)
m := paramFormat(msg, &arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.MainJudge(&arg)
+ // 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+ ruleserver.Judge(&arg,&m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
- resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
-
+ resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
- insertdata.InsertToEs(resultMag)
+ insertdata.InsertToEs(resultMsg)
+ //浜嬩欢鎺ㄩ��
+ //labelFilter.Judge(resultMsg)
}
}
}
}
-// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� ArgsFromSdk
-func paramFormat(msg []byte, arg *ruleserver.ArgsFromSdk) protomsg.SdkMessage {
+// 灏嗗閮ㄤ紶杩涙潵鐨剅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)
+ rect.Width = float64(rcobj.Right - rcobj.Left)
+ rect.Height = float64(rcobj.Bottom - rcobj.Top)
+ return rect
+}
+
+// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
+func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ logger.Info("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
}
}()
@@ -68,74 +109,95 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- arg.CameraId = m.Cid
- arg.TaskId = m.Tasklab.Taskid
+
+ // 鍏堣繘琛屼竴涓嬭拷韪�
+ ruleserver.FaceIsSame(&m)
+ args.CameraId = m.Cid
+ args.TaskId = m.Tasklab.Taskid
+ // 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
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
- fmt.Println("浠巑ongos涓嬁鍒扮殑鏁版嵁鍖呴暱搴︿负锛�", len(msg))
+ //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ arg := ruleserver.SdkData{}
+ 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)
+ 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鎵嶆湁鏁版嵁
- fmt.Println("----------------------------------------------------",m.Caddr)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
+ logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
}
+ var yoloNum int = 0
for _, info := range yoloParam.Infos {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)}
- arg.Photo = append(arg.Photo, photoMap)
+ 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
}
}
- //if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- // fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
- // 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)
- // continue
- // }
- // for _, info := range faceParam.Faces {
- // photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
- // arg.Photo = append(arg.Photo, photoMap)
- // }
- // } else {
- // continue
- // }
- //}
- //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-
- //}
-
+ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ arg := ruleserver.SdkData{}
+ 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)
+ arg.ImageWidth = int(i.Width)
+ arg.ImageHeight = int(i.Height)
+ // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
+ arg.KeepRight = false
+ arg.IsStatic = false
+ if len(sdkinfo.Sdkdata) > 1 {
+ faceParam := protomsg.ParamFacePos{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
+ for _, info := range faceParam.Faces {
+ //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)
+ } else {
+ continue
+ }
+ }
}
return m
-}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
- rect := ruleserver.Rect{}
- fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
- rect.X = float64(rcobj.Left)
- rect.Y = float64(rcobj.Top)
- rect.Width = float64(rcobj.Right - rcobj.Left)
- rect.Height = float64(rcobj.Bottom - rcobj.Top)
- return rect
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0