~jinersong/ruleprocess.git

			@@ -3,6 +3,7 @@
			import (
			"basic.com/dbapi.git"
			"basic.com/pubsub/protomsg.git"
			"basic.com/valib/logger.git"
			"encoding/json"
			"errors"
			"fmt"
			@@ -13,7 +14,6 @@
			"nanomsg.org/go-mangos/transport/tcp"
			"net"
			"ruleprocess/cache"
			"basic.com/valib/logger.git"
			"ruleprocess/structure"
			"strconv"
			"time"
			@@ -31,8 +31,6 @@
			}

			func Init() {
			//logger.Debug("本机信息和server信息：", localConfig, serverIp, serverPort)
			//bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
			go Push1()
			}

			@@ -63,7 +61,6 @@
			taskGroup = task
			}
			}
			logger.Debug("当前数据帧要匹配的规则组：-------------------------","摄像机id:",cameraId,"任务id",taskId)
			if taskGroup == nil {
			return nil
			} else {
			@@ -78,7 +75,7 @@
			func GetPolygons(cameraId string) []protomsg.CameraPolygon {
			var cameraPolygons []protomsg.CameraPolygon
			cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
			logger.Debug("------=======查看下全部区域：",cameraPolygons)
			//logger.Debug("------=======查看下全部区域：",cameraPolygons)
			return cameraPolygons
			}

			@@ -89,16 +86,16 @@
			}
			func Decimal(value float32) float64 {
			value1, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(value)), 64)
			logger.Info("初步保留两位成str:",value1)
			//logger.Info("初步保留两位成str:",value1)
			n10 := math.Pow10(4)
			value2 := math.Trunc((value1+0.5/n10)*n10) / n10
			logger.Info("初步保留两位成str::::",value2)
			//logger.Info("初步保留两位成str::::",value2)
			return value2
			}
			// 取出某个时间规则的第几天的规则段集合
			func GetTimeById(id string, index int) []TimeRange {
			func GetTimeById(id string, index int) []structure.TimeRange {
			_, cameraTimeRule := cache.GetTimeRuleById(id)
			var timeRangeList []day
			var timeRangeList []structure.Day
			err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
			if err != nil {
			logger.Error("取时间规则时反序列化错误！")
			@@ -123,24 +120,17 @@
			return 0
			}

			type TimeRange struct {
			Start string `json:"start"`
			End string `json:"end"`
			}
			type day struct {
			Day int `json:"day"` // 标示当前星期几
			TimeRange []TimeRange `json:"time_range"` // 当天的几个时间段
			}


			// 将字符串格式的坐标序列化为Point格式
			func Json2points(areaPoints string) []Point {
			var pts []Point
			func Json2points(areaPoints string) []structure.Point {
			var pts []structure.Point
			if areaPoints == "[]" \|\| areaPoints == "" {
			logger.Error("=====================此区域为全部区域")
			pts = append(pts, Point{0, 0})
			pts = append(pts, Point{0, 540})
			pts = append(pts, Point{960, 540})
			pts = append(pts, Point{960, 0})
			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})
			} else {
			err := json.Unmarshal([]byte(areaPoints), &pts)
			if err != nil {
			@@ -162,7 +152,6 @@
			}

			bytes := getCompareMsg(comArg)
			//bytes := []byte{}
			var scResult protomsg.SdkCompareResult
			err1 := proto.Unmarshal(bytes, &scResult)
			if err1 != nil {
			@@ -247,14 +236,6 @@
			//logger.Info("--------------看看compareFlag的值和tableId和areaMap.args的长度：",compareFlag,tableIds,len(areaMap.args))
			for _, arg := range areaMap.Args {
			arg.Liker = arg.Liker[0:0]
			//logger.Info("清空之后看看之前打的人脸标签变了没：")
			//if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
			// for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
			// for _,arg := range faceResult.Args {
			// logger.Info("人员分值是：",arg.Score,"liker的数量为",arg.Liker)
			// }
			// }
			//}
			if compareFlag == 1 {
			fillLiker(nil, threshold, arg)
			}
			@@ -285,26 +266,21 @@

			areaPoints := Json2points(a.AreaJson)
			logger.Info("看看图片的width和height:",arg.ImageWidth,arg.ImageHeight)
			widthScale := float64(arg.ImageWidth / 960)
			heigthScale := float64(arg.ImageHeight / 540)
			widthScale := float64(arg.ImageWidth) / 960
			heigthScale := float64(arg.ImageHeight) / 540
			for _, obj := range arg.Photo {
			//logger.Info("------------------看看sdkData:", arg.SdkName, "的Photo数据----------------", obj, "----顺便看看占比-----：", PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale))
			if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
			if obj.Score >= threshold && float64(obj.Rects.Width*obj.Rects.Height) >= size && PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) >= intersectionper {
			// 这步要备齐表达式里所需要的所有参数
			a.TargetNum++
			arg1 := structure.Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*structure.BaseInfo{}}
			arg1 := structure.Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*structure.BaseInfo{},nil}
			//logger.Println("放进去的arg：-------", arg1)
			a.Args = append(a.Args, &arg1)
			a.FilterData = append(a.FilterData, &arg1)
			}
			}
			logger.Info("区域是：",areaPoints,"区域内目标数量为：",a.TargetNum,"---",len(a.FilterData))
			for _,tar := range a.FilterData {
			logger.Info("具体目标的坐标为",tar.Id,tar.Location)
			}
			a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
			a.KeepRight = arg.KeepRight
			a.IsStatic = arg.IsStatic
			//logger.Println("--------------------看看区域数据：",*a)
			}

			@@ -362,7 +338,6 @@
			logger.Debug("数据推送成功！收到响应,数据长度为：",len(msg))
			return msg
			}


			func Push1(){
			//var sock mangos.Socket