---
panlei
2019-07-22 e383e503030119c870eb0bb5efe0a865124b9bcf
ruleserver/readyDataForRule.go
@@ -8,7 +8,6 @@
   "fmt"
   "github.com/go-yaml/yaml"
   "io/ioutil"
   "os"
   "ruleprocess/cache"
   "ruleprocess/logger"
   "strconv"
@@ -79,13 +78,14 @@
}
// 保留四位小数
func Retain(f float32)(float32) {
func Retain(f float32)(float64) {
   s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
   v, err := strconv.ParseFloat(s, 32)
   v, err := strconv.ParseFloat(s, 64)
   if err != nil {
      logger.Error("保留四位小数转换错误")
   }
   return float32(v)
   // float32与float64互转会有位数保留不准的问题
   return v
}
// 取出某个时间规则的第几天的规则段集合
@@ -174,7 +174,9 @@
         if err != nil || len(table) == 0{
            logger.Error("根据id查询底库信息出错!",err,"--返回值长度为:",len(table))
         }
         base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:float64(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
         base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:Retain(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
         //logger.Debug("看看这个base的对比值是多少:",base)
         //os.Exit(1)
         arg.Liker = append(arg.Liker, &base)
      }
   }
@@ -219,7 +221,7 @@
               for _, areaMap := range sdkData.AreaMapList {
                  // 拿区域中每个人脸特征值去对比,填充其liker
                  if groupRule.Rules[j].PolygonId == areaMap.areaId {
                     logger.Info("--------------看看compareFlag的值和tableId:",compareFlag,tableIds)
                     logger.Info("--------------看看compareFlag的值和tableId和areaMap.args的长度:",compareFlag,tableIds,len(areaMap.args))
                     for _, arg := range areaMap.args {
                        if compareFlag == 1 {
                           arg.fillLiker(nil,threshold)
@@ -232,7 +234,7 @@
                     areaMap.filterData = areaMap.args
                     //logger.Info("=======第一次看args:",(areaMap.filterData))
                  }
                  logger.Info("-------------------------------人脸对比之后的目标数量",len(areaMap.args))
                  //logger.Info("-------------------------------人脸对比之后的目标数量",len(areaMap.args))
               }
            }
         }