From b0fecafd3e44fa7919249e01e7f6446e1214d46a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 16:10:37 +0800
Subject: [PATCH] ---
---
main.go | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/main.go b/main.go
index d15b8c0..d6ee9a0 100644
--- a/main.go
+++ b/main.go
@@ -1,40 +1,47 @@
package main
import (
+ "basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
"bufio"
"bytes"
- "encoding/json"
- "errors"
+ "flag"
"fmt"
+ "github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
"image/color"
- "io"
"log"
- "mime/multipart"
- "net/http"
"os"
+ "ruleprocess/cache"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
- "time"
-
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "github.com/golang/protobuf/proto"
+ "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 main() {
- //wg := sync.WaitGroup{}
- //wg.Add(1)
- //go ruleserver.TimeTicker()
- //nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
- //wg.Wait()
- resp,err := DrawPolygonOnImage()
- if err != nil {
- log.Println("鐢绘鎴栬�呬笂浼犳湁闂")
- }
- log.Println(resp["fileUrl"].(string))
+ flag.Parse()
+ wg := sync.WaitGroup{}
+ wg.Add(1)
+
+ dbapi.Init(*dbIp,*dbPort)
+ go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
+ fmt.Println("cache init completed!!!",<- 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("鐢绘鎴栬�呬笂浼犳湁闂")
+ //}
+ //log.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -103,7 +110,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
-
+ log.Println("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
arg := ruleserver.SdkData{}
@@ -124,13 +131,13 @@
arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
- fmt.Println("----------------------------------------------------",m.Cid)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ log.Println("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅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}
@@ -161,13 +168,13 @@
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)
continue
}
+ log.Println("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",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)}
arg.Photo = append(arg.Photo, photoMap)
@@ -195,13 +202,13 @@
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
}
+ log.Println("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯鎻愬彇涓湁鍑犱釜鐩爣锛�",len(faceParam.ExtComp))
for _, extComp := range faceParam.ExtComp {
baseinfos := protomsg.Binfos{}
err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
@@ -298,7 +305,7 @@
// return nil, err
// }
return nil, nil
- }
+ //}
}
// 鎶婂浘鐗囪浆鎴愪簩杩涘埗娴�
--
Gitblit v1.8.0