From e3aaa0b9b08e4e7d72b46762a216ee8c37969d9d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 11:51:11 +0800
Subject: [PATCH] 修改日志包，一天打一个文件
---
main.go | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 252 insertions(+), 39 deletions(-)
diff --git a/main.go b/main.go
index e6375c9..a74d53b 100644
--- a/main.go
+++ b/main.go
@@ -1,23 +1,57 @@
package main
import (
+ "basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+ "bufio"
+ "bytes"
+ "flag"
"fmt"
+ "github.com/golang/protobuf/proto"
+ "gocv.io/x/gocv"
+ "image"
+ "image/color"
+ "os"
+ "ruleprocess/cache"
"ruleprocess/insertdata"
"ruleprocess/ruleserver"
"ruleprocess/util"
-
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/deliver.git"
- "github.com/golang/protobuf/proto"
+ "ruleprocess/logger"
"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 () {
+ var logFile = "./info.log"
+ var logSaveDays = 15
+ // 鏃ュ織鍒濆鍖�
+ logger.Config(logFile, logger.DebugLevel)
+ logger.SetSaveDays(logSaveDays)
+ logger.Info("loginit success !")
+}
func main() {
+ flag.Parse()
wg := sync.WaitGroup{}
wg.Add(1)
+
+ dbapi.Init(*dbIp,*dbPort)
+ go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
+ 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 {
+ // logger.Println("鐢绘鎴栬�呬笂浼犳湁闂")
+ //}
+ //logger.Println(resp["fileUrl"].(string))
}
func nReciever(url string, m deliver.Mode, count int) {
c := deliver.NewServer(m, url)
@@ -36,16 +70,17 @@
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{}
m := paramFormat(msg, &arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
- ruleserver.MainJudge(&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)
@@ -54,11 +89,21 @@
}
}
-// 灏嗗閮ㄤ紶杩涙潵鐨剆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 {
+ 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,72 +113,240 @@
if err != nil {
panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
}
- arg.CameraId = m.Cid
- arg.TaskId = m.Tasklab.Taskid
+ args.CameraId = m.Cid
+ // 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
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.SdkId = sdkinfo.Sdkid
+ arg.SdkName = sdkinfo.SdkName
+ 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
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
+ logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
}
+ logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
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 {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
}
+ args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
}
}
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ 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.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ logger.Info("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
+ 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)
}
+ args.Sdkdata = append(args.Sdkdata,&arg)
} else {
continue
}
}
- //if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
-
- //}
+ 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)
+ }
+ 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
}
-// 灏嗗閮ㄤ紶杩涙潵鐨剅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
+func DrawPolygonOnImage()(maps map[string]interface{}, err0 error){
+ // draw the rook
+ //rook := gocv.NewMatWithSize(w, w, gocv.MatTypeCV8UC3)
+ //imgs := gocv.NewMat()
+ ddd, err := RetrieveROM("./105.jpg")
+ if err != nil {
+ logger.Info("瑙ｇ爜鏈夎",err)
+ }
+ bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
+ rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, bbb.Bytes())
+ defer rook.Close()
+ green := color.RGBA{0, 255, 0, 0}
+ points := [][]image.Point{
+ {
+ image.Pt(100., 100),
+ image.Pt(100., 400),
+ image.Pt(400, 400),
+ image.Pt(400, 100),
+ },
+ }
+ gocv.FillPoly(&rook, points, green)
+ // 涓婁紶
+ //fdata,_ := gocv.IMEncode(".jpg",rook)
+ //body := &bytes.Buffer{}
+ //writer := multipart.NewWriter(body)
+ //_, err1 := writer.CreateFormFile("file", "fasjuierf")
+ //if err1 != nil {
+ // return nil, err1
+ //}
+ //boundary := writer.Boundary()
+ ////close_string := fmt.Sprintf("\r\n--%s--\r\n", boundary)
+ //close_buf := bytes.NewBufferString(fmt.Sprintf("\r\n--%s--\r\n", boundary))
+ //file := bytes.NewBuffer(fdata)
+ //request_reader := io.MultiReader(body, file, close_buf)
+ ////_, err = io.Copy(part, file)
+ ////writer.WriteField(key, val)
+ //request, err := http.NewRequest("POST", "http://192.168.1.182:6333/submit", request_reader)
+ //request.Header.Add("Content-Type", writer.FormDataContentType())
+ //timeout := time.Duration(5 * time.Second) //瓒呮椂鏃堕棿50ms
+ //client := &http.Client{Timeout: timeout}
+ //resp, err := client.Do(request)
+ //if err != nil {
+ // logger.Fatal(err)
+ // return nil, err
+ //}
+ //defer func() {
+ // if r := recover(); r != nil {
+ // fmt.Printf("panic鐨勫唴瀹�%v\n", r)
+ // msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
+ // if _, ok := r.(error); ok {
+ // msg = r.(error).Error()
+ // logger.Info("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ // }
+ // if _, ok := r.(string); ok {
+ // msg = r.(string)
+ // logger.Info("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ // }
+ // err0 = errors.New(msg)
+ // }
+ //}()
+ //defer resp.Body.Close()
+ //{
+ // body := &bytes.Buffer{}
+ // _, err := body.ReadFrom(resp.Body)
+ // if err != nil {
+ // logger.Fatal(err)
+ // }
+ // 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 {
+ // return nil, err
+ // }
+ return nil, nil
+ //}
}
+
+// 鎶婂浘鐗囪浆鎴愪簩杩涘埗娴�
+func RetrieveROM(filename string) ([]byte, error) {
+ file, err := os.Open(filename)
+
+ if err != nil {
+ return nil, err
+ }
+ defer file.Close()
+
+ stats, statsErr := file.Stat()
+ if statsErr != nil {
+ return nil, statsErr
+ }
+
+ var size int64 = stats.Size()
+ bytes := make([]byte, size)
+
+ bufr := bufio.NewReader(file)
+ _, err = bufr.Read(bytes)
+
+ return bytes, err
+}
\ No newline at end of file
--
Gitblit v1.8.0