~jinersong/ruleprocess.git

			@@ -16,6 +16,7 @@
			"ruleprocess/cache"
			"ruleprocess/logger"
			"github.com/golang/protobuf/proto"
			"ruleprocess/structure"
			"strconv"
			"time"
			)
			@@ -56,20 +57,6 @@
			}
			}

			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 {
			@@ -110,9 +97,9 @@
			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("取时间规则时反序列化错误！")
			@@ -137,24 +124,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 {
			@@ -166,7 +146,7 @@
			}

			// 给目标填充liker
			func (arg *Arg) FillLiker(tableId []string, compareThreshold float32) {
			func FillLiker(arg *structure.Arg,tableId []string, compareThreshold float32) {
			//bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
			comArg := &protomsg.CompareArgs{
			TableIds:tableId,
			@@ -204,7 +184,7 @@
			logger.Error("根据id查询底库信息出错！", err, "--返回值长度为：", len(table))
			}
			logger.Debug("看看这个base的对比值是多少：", Decimal(m[baseinfo.Id].CompareScore))
			base := BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
			base := structure.BaseInfo{TableId: baseinfo.TableId, TableName: table[0].TableName, BwType: table[0].BwType, CompareScore: Decimal(m[baseinfo.Id].CompareScore), PersonId: baseinfo.Id, PersonName: baseinfo.PersonName, PersonPicUrl: baseinfo.PersonPicUrl, PhoneNum: baseinfo.PhoneNum, Sex: baseinfo.Sex, IdCard: baseinfo.IdCard, MonitorLevel: baseinfo.MonitorLevel, Content: baseinfo.Reserved}
			//os.Exit(1)
			arg.Liker = append(arg.Liker, &base)
			}
			@@ -213,7 +193,7 @@
			}

			// 人脸比对
			func Compare(args SdkDatas, groupRule protomsg.GroupRule) {
			func Compare(args structure.SdkDatas, groupRule protomsg.GroupRule) {
			compareFlag := 0
			var tableIds []string
			var threshold float32 = 50 // 默认阈值为50
			@@ -255,18 +235,18 @@
			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) {
			if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]structure.FaceResult)) > 0 {
			for _, faceResult := range args.RuleResult["face"].([]structure.FaceResult) {
			for _,arg := range faceResult.Args {
			logger.Info("人员分值是：",arg.Score,"liker的数量为",arg.Liker)
			}
			}
			}
			if compareFlag == 1 {
			arg.FillLiker(nil, threshold)
			FillLiker(arg,nil, threshold)
			}
			if compareFlag == 2 {
			arg.FillLiker(tableIds, threshold)
			FillLiker(arg,tableIds, threshold)
			}
			//logger.Info("-------------------成功给liker赋值,长度为：", len(arg.Liker))
			}
			@@ -283,7 +263,7 @@
			}

			// 计算区域内的目标数量以及将相似度、占比、尺寸等打包
			func (a AreaMap) CountAreaObjs(arg SdkData) {
			func CountAreaObjs(a structure.AreaMap,arg structure.SdkData) {

			a.TargetNum = 0
			threshold := 0.0 // 相似度
			@@ -298,7 +278,7 @@
			if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
			// 这步要备齐表达式里所需要的所有参数
			a.TargetNum++
			arg1 := 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, []*BaseInfo{}}
			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, []*BaseInfo{}}
			//logger.Println("放进去的arg：-------", arg1)
			a.Args = append(a.Args, &arg1)
			a.FilterData = append(a.FilterData, &arg1)
			@@ -312,16 +292,16 @@
			}

			// 把sdk从数据帧上提取的按照区域分类归置
			func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
			func SdkDataFormat(cameraId string, arg *structure.SdkData, cameraPolygons []protomsg.CameraPolygon) {
			logger.Info("==================================本sdkData中解出来的目标数据=======================================")
			for _, photo := range arg.Photo {
			logger.Info("--------解析出来的数据---", cameraId, arg.IpcId, photo.Rects, photo.Score)
			}
			for _, polygon := range cameraPolygons {
			//logger.Println("++++++在这儿看一下区域啊:", polygon.Polygon)
			areaMap := AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
			areaMap := structure.AreaMap{CameraId: cameraId, AreaId: polygon.Id, AreaJson: polygon.Polygon, TriggerLine: polygon.TriggerLine, DirectionLine: polygon.DirectionLine}
			// 为每个摄像机区域填充数据
			areaMap.CountAreaObjs(arg)
			CountAreaObjs(&areaMap,arg)
			arg.AreaMapList = append(arg.AreaMapList, &areaMap)
			}
			}