From 6ed5521a978b330b990f2c4092e729207fca2412 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 11 十月 2019 13:48:54 +0800
Subject: [PATCH] 除了架构把代码跟主分支同步一下
---
ruleserver/readyDataForRule.go | 136 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 32 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index f9bba68..2b97579 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -1,23 +1,21 @@
package ruleserver
import (
- bigCache "basic.com/pubsub/cache.git"
- "basic.com/pubsub/cache.git/esutil"
+ "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"errors"
"fmt"
"github.com/go-yaml/yaml"
+ "github.com/golang/protobuf/proto"
"io/ioutil"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
"net"
- "os"
"ruleprocess/cache"
- "ruleprocess/logger"
- "github.com/golang/protobuf/proto"
"ruleprocess/structure"
"strconv"
"time"
@@ -52,13 +50,25 @@
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
- bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
- sock, err = req.NewSocket();
- if err != nil {
- logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
- }
+ go Push1()
}
+var sender chan *protomsg.CompareArgs = make(chan *protomsg.CompareArgs)
+var receiver chan []byte = make(chan []byte)
+type BaseInfo struct {
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
+ BwType string `json:"bwType"`
+ CompareScore float64 `json:"compareScore"`
+ PersonId string `json:"personId"`
+ PersonName string `json:"personName"`
+ PersonPicUrl string `json:"personPicUrl"`
+ PhoneNum string `json:"phoneNum"`
+ Sex string `json:"sex"`
+ IdCard string `json:"idCard"`
+ MonitorLevel string `json:"monitorLevel"`
+ Content string `json:"content"`
+}
// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
func GetRuleGroup(cameraId string, taskId string) *protomsg.TaskGroupArgs {
@@ -71,10 +81,14 @@
}
}
logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
- for _,ruleGroup := range taskGroup.GroupRules{
- logger.Info(ruleGroup.GroupText)
+ if taskGroup == nil {
+ return nil
+ } else {
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
+ return taskGroup
}
- return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
@@ -129,14 +143,14 @@
// 灏嗗瓧绗︿覆鏍煎紡鐨勫潗鏍囧簭鍒楀寲涓篜oint鏍煎紡
-func Json2points(areaPoints string) []structure.Point {
- var pts []structure.Point
+func Json2points(areaPoints string) []Point {
+ var pts []Point
if areaPoints == "[]" || areaPoints == "" {
logger.Error("=====================姝ゅ尯鍩熶负鍏ㄩ儴鍖哄煙")
- pts = append(pts, structure.Point{0, 0})
- pts = append(pts, structure.Point{0, 540})
- pts = append(pts, structure.Point{960, 540})
- pts = append(pts, structure.Point{960, 0})
+ pts = append(pts, Point{0, 0})
+ pts = append(pts, Point{0, 540})
+ pts = append(pts, Point{960, 540})
+ pts = append(pts, Point{960, 0})
} else {
err := json.Unmarshal([]byte(areaPoints), &pts)
if err != nil {
@@ -156,12 +170,13 @@
CompareThreshold:compareThreshold,
Source:false,
}
- serverIp, _ := GetLocalIP()
- bytes := Push("tcp://"+serverIp+":40010",comArg,sock)
+
+ bytes := getCompareMsg(comArg)
var scResult protomsg.SdkCompareResult
err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
+ return
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
@@ -173,16 +188,20 @@
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
+ var dbApi dbapi.DbPersonApi
+ baseinfos, err1 := dbApi.Dbpersoninfosbyid(ids)
+ //baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
+ var dtapi dbapi.DbTableApi
for _, baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
//logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
tableIds := []string{}
tableIds = append(tableIds, baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
- table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
+ table, err := dtapi.DbtablesById(tableIds)
+ //table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
@@ -269,7 +288,7 @@
func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {
a.TargetNum = 0
- threshold := 0.0 // 鐩镐技搴�
+ threshold := 0.5 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
@@ -287,7 +306,7 @@
a.FilterData = append(a.FilterData, &arg1)
}
}
- //logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
+ logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.TargetNum,"---",len(a.FilterData))
a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.KeepRight = arg.KeepRight
a.IsStatic = arg.IsStatic
@@ -309,7 +328,7 @@
}
}
-func Push(url string,data *protomsg.CompareArgs,sock mangos.Socket) []byte{
+func Push(data *protomsg.CompareArgs,sock mangos.Socket) []byte{
//var sock mangos.Socket
var err error
var msg []byte
@@ -322,11 +341,13 @@
logger.Error("Failed set MaxRecvSize: %v", err)
return nil
}
- //sock.AddTransport(ipc.NewTransport())
- sock.AddTransport(tcp.NewTransport())
- if err = sock.Dial(url); err != nil {
+ serverIP, _ := GetLocalIP()
+ if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
+
logger.Info("搴忓垪鍖栨暟鎹�")
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
@@ -337,16 +358,67 @@
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
if msg, err = sock.Recv(); err != nil {
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
return msg
}
+func Push1(){
+ //var sock mangos.Socket
+ var err error
+ var msg []byte
+
+ if sock, err = req.NewSocket(); err != nil {
+ logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+ }
+ errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
+ if errSize != nil {
+ logger.Error("Failed set MaxRecvSize: %v", err)
+ }
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
+ serverIP, _ := GetLocalIP()
+ if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ }
+ logger.Info("搴忓垪鍖栨暟鎹�")
+
+ for {
+ select {
+ // case <-ctx.Done():
+ // return
+ case data := <- sender:
+ bytes,err1 := proto.Marshal(data)
+ logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
+ if err1 != nil {
+ logger.Info("搴忓垪鍖栧け璐ワ細",err1)
+ }
+ logger.Debug("鎺ㄩ�佹暟鎹�")
+ //bytes := []byte("ndfasojdfaidsos")
+ if err = sock.Send(bytes); err != nil {
+ logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+ //os.Exit(1)
+ }
+ if msg, err = sock.Recv(); err != nil {
+ logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ //os.Exit(1)
+ }
+ logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
+ receiver <- msg
+ default:
+
+ }
+ }
+}
+func getCompareMsg(data *protomsg.CompareArgs) []byte{
+ sender <- data
+ return <-receiver
+}
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
var (
@@ -373,4 +445,4 @@
err = errors.New("ipv4 not found")
return
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0