From 5ef713cf88ed4ba20d3be12ff8c12593eab2d7b3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 10:51:20 +0800
Subject: [PATCH] ---

---
 main.go |  241 ++++++++++++++---------------------------------
 1 files changed, 73 insertions(+), 168 deletions(-)

diff --git a/main.go b/main.go
index 5a4d7ea..7c8f61c 100644
--- a/main.go
+++ b/main.go
@@ -1,28 +1,27 @@
 package main
 
 import (
-	"basic.com/dbapi.git"
-	"basic.com/pubsub/protomsg.git"
-	"basic.com/valib/deliver.git"
-	"net/http"
-	_ "net/http/pprof"
-	"ruleprocess/insertdata"
-	"ruleprocess/util"
-	"time"
 
-	//"bufio"
-	//"bytes"
 	"flag"
 	"fmt"
-	"github.com/golang/protobuf/proto"
-	"ruleprocess/logger"
-	//"gocv.io/x/gocv"
-	//"image"
-	//"image/color"
-	//"os"
+	"github.com/spf13/viper"
+	"sync"
+	"net/http"
+	_ "net/http/pprof"
+	"plugin"
+
+	//"github.com/spf13/viper"
+	//"basic.com/valib/logger.git"
+	"basic.com/valib/logger.git"
+	"github.com/panjf2000/ants/v2"
+
+	"basic.com/pubsub/protomsg.git"
+	"basic.com/valib/deliver.git"
+	"ruleprocess/insertdata"
+	"ruleprocess/labelFilter"
+	"ruleprocess/structure"
 	"ruleprocess/cache"
 	"ruleprocess/ruleserver"
-	"sync"
 )
 
 var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -35,12 +34,24 @@
 func init() {
 	flag.Parse()
 	// 鏃ュ織鍒濆鍖�
-	logger.Config("./info.log", logger.DebugLevel)
-	logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
-	insertdata.Init(*env)
+
+	structure.Init(*env)
+	var logFile = "./logger/"
+	if viper.GetString("LogBasePath") != "" {
+		logFile = viper.GetString("LogBasePath")
+	}
+	logFile = logFile + "ruleprocess.log"
+	fmt.Println("鏃ュ織鍦板潃锛�",logFile)
+	logger.Config(logFile, logger.DebugLevel)
+	logger.SetSaveDays(7)
+	// log4go
+	//logger.LoadConfiguration("./logger/log.xml")
+	logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒",logFile)
+
 }
 func main() {
 	//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+	defer ants.Release()
 	go func() {
 		http.ListenAndServe("0.0.0.0:8899",nil)
 	}()
@@ -48,14 +59,17 @@
 	wg := sync.WaitGroup{}
 	wg.Add(3)
 
-	dbapi.Init(*dbIp, *dbPort)
 	go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
 	logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
 	ruleserver.Init()
+	labelFilter.Init()
+
 	go ruleserver.TimeTicker()
 	go ruleserver.StartServer()
+
 	nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
 	wg.Wait()
+
 }
 func nReciever(url string, m deliver.Mode, count int) {
 	c := deliver.NewServer(m, url)
@@ -63,162 +77,53 @@
 }
 
 func nRecvImpl(c deliver.Deliver, index int) {
-
 	var msg []byte
+	//var wg1 sync.WaitGroup
+	//p,_ := ants.NewPool(20)
+	//syncCalculateSum := func() {
+	//	Task(msg)
+	//	wg1.Done()
+	//}
+	//wg1.Wait()
 	var err error
-	//msgChan := make(chan []byte,100)
 	for {
-		select {
-		// case <-ctx.Done():
-		// 	return
-		default:
-			msg, err = c.Recv()
-			//msgChan <- msg
-			if err != nil {
-				logger.Info("recv error : ", err)
-				fmt.Println("recv error : ", err)
-				continue
-			} else {
-				//runtime.GOMAXPROCS(runtime.NumCPU())
-				//logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
-				//go func(msg []byte) {
-					logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
-					arg := ruleserver.SdkDatas{}
-					//paramFormat(msg, &arg)
-					start := time.Now()
-					m := paramFormat(msg, &arg)
-					// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
-					ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
-					// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
-					resultMsg := ruleserver.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
-					logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", time.Since(start))
-					// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
-					insertdata.InsertToEs(resultMsg)
-					logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
-					//浜嬩欢鎺ㄩ��
-					//go labelFilter.Judge(resultMsg)
-				//}(msg)
-			}
+		msg, err = c.Recv()
+		if err == nil {
+			//wg1.Add(1)
+			//_ = p.Submit(syncCalculateSum)
+			Task(msg)
+		} else {
+			//fmt.Println(err)
+			//logger.Info(err)
 		}
 	}
 }
 
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剅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
+func Task (msg []byte) {
+	arg := structure.SdkDatas{}
+	//start := time.Now()
+	m := CallParamFormat(msg, &arg)
+	// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
+	ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
+	// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
+	resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
+	ruleserver.GetAttachInfo(resultMsg.SdkMessage)
+	// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
+	insertdata.InsertToEs(resultMsg)
+	//浜嬩欢鎺ㄩ��
+	labelFilter.PushSomthing(resultMsg)
 }
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
-func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
-	defer func() {
-		if err := recover(); err != nil {
-			logger.Info("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
-		}
-
-	}()
-	// 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
-	m := protomsg.SdkMessage{}
-	err := proto.Unmarshal(msg, &m)
+func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
+	//logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+	p,err :=  plugin.Open("./algorithm/middleware.so")
 	if err != nil {
-		panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
+		panic(err)
 	}
-
-	// 鍏堣繘琛屼竴涓嬭拷韪�
-	ruleserver.FaceIsSame(&m)
-	args.CameraId = m.Cid
-	args.TaskId = m.Tasklab.Taskid
-	// 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
-	bdata, err := util.UnCompress(m.Data)
-	if err != nil {
-		panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+	f,err1 := p.Lookup("ParamFormat")
+	if err1 != nil {
+		panic("娌℃湁鎵惧埌涓棿浠剁殑鏍煎紡鍖栨暟鎹嚱鏁�")
 	}
-	i := protomsg.Image{}
-	err = proto.Unmarshal(bdata, &i)
-	logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細", m.Cid, "鍥剧墖鐨刬d涓猴細", i.Id)
-	//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.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鎵嶆湁鏁版嵁
-				yoloParam := protomsg.ParamYoloObj{}
-				err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
-				if err != nil {
-					logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
-					continue
-				}
-				var yoloNum int = 0
-				for _, info := range yoloParam.Infos {
-					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" { // 浜鸿劯妫�娴�
-			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("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細", 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
+	mess := f.(func(msg []byte, args *structure.SdkDatas)(protomsg.SdkMessage))(msg,args)
+	return mess
 }
+

--
Gitblit v1.8.0