fix add cluster

sunty

2019-11-01 15574512dca10c90c9c872c8049d8f4cd4135998

 controllers/fileController.go

@@ -198,6 +198,7 @@
   BaseInfo []DbPersonVo `json:"baseInfo"`
   VideoUrl string `json:"videoUrl"`
   SdkName string `json:"sdkName"`
   AlarmRules []AlarmRuleVo `json:"alarmRules"`
}
type DbPersonVo struct {
   BwType string `json:"bwType"`
@@ -217,6 +218,15 @@
type ScoreIndex struct {
   CompareScore float32
   Index int
}

type AlarmRuleVo struct {
   GroupId      string `json:"groupId"`
   AlarmLevel   string `json:"alarmLevel"`
   RuleText     string `json:"ruleText"`
   DefenceState bool `json:"defenceState"`
   IsLink        bool `json:"isLink"`
   LinkInfo     string `json:"linkInfo"`
}

//填充向前端返回的数据
@@ -288,7 +298,7 @@
      logger.Debug("comp videoPersons.len:",len(videopersons))
      for _,vp :=range videopersons {
         isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
         bi := make([]DbPersonVo,0)
         var bi []DbPersonVo
         for _,p :=range vp.BaseInfo {
            bi = append(bi, DbPersonVo{
               PersonId: p.PersonId,
@@ -300,9 +310,22 @@
               PhoneNum: p.PhoneNum,
               Sex: p.Sex,
               TableId: p.TableId,
               BwType: strconv.Itoa(int(p.BwType)),
               BwType: p.BwType,
               TableName: p.TableName,
            })
         }
         var alarmRules []AlarmRuleVo
         if vp.AlarmRules !=nil && len(vp.AlarmRules) >0 {
            for _,ar :=range vp.AlarmRules {
               alarmRules = append(alarmRules, AlarmRuleVo{
                  GroupId: ar.GroupId,
                  AlarmLevel: ar.AlarmLevel,
                  RuleText: ar.RuleText,
                  DefenceState: ar.DefenceState,
                  IsLink: ar.IsLink,
                  LinkInfo: ar.LinkInfo,
               })
            }
         }
         vpE := CompareResult{
            Id: vp.Id,
@@ -321,6 +344,7 @@
            VideoUrl: vp.VideoUrl,
            BaseInfo: bi,
            SdkName: "人脸",
            AlarmRules: alarmRules,
         }
         resultList[captureM[vp.Id].Index] = vpE
      }
@@ -569,7 +593,7 @@
         logger.Debug("searchPhoto first Result.len:",len(*co.CompareData),"twice len(captureIds):",len(captureIds))
         if captureIds !=nil {
            var aResult protomsg.SdkCompareResult
            aList := getTwiceSearchResult(co, &captureIds)
            aList := getTwiceSearchResult(co, &captureIds, searchBody)
            aTotal := aList.Len()
            if aTotal <= to {
               aResult.CompareResult = (*aList)[from:aTotal]
@@ -602,7 +626,7 @@
               personIdArr = append(personIdArr, pid.Id)
            }
            var aResult protomsg.SdkCompareResult
            aList := getTwiceSearchResult(co, &personIdArr)
            aList := getTwiceSearchResult(co, &personIdArr, searchBody)
            aTotal := aList.Len()
            if aTotal <= to {
               aResult.CompareResult = (*aList)[from:aTotal]
@@ -642,14 +666,14 @@
   return m
}

func getTwiceSearchResult(co *service.CompareOnce, scopeIds *[]string) *service.CompareList{
func getTwiceSearchResult(co *service.CompareOnce, scopeIds *[]string, searchBody *models.EsSearch) *service.CompareList{
   m := make(map[string]string)
   for _,capId :=range *scopeIds {
      m[capId] = capId
   }
   var totalData service.CompareList
   for _,each :=range *co.CompareData {
      if _,ok :=m[each.Id];ok{
      if _,ok :=m[each.Id];ok && each.CompareScore >= searchBody.Threshold {
         totalData = append(totalData, each)
      }
   }
@@ -803,8 +827,10 @@
   }
   extNames := make([]string, 0)
   addResult := make(map[string]interface{}, 0)
   successList := make([]string, 0)
   failList := make([]string,0)
   var successList []string
   var failList []string
   var noFaceList []string
   var multiFaceList []string
   tAllStart := time.Now()
   var wg sync.WaitGroup
   var lock sync.Mutex
@@ -832,7 +858,13 @@
         field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
         lock.Lock()
         if err1 != nil || field == "" {
            failList = append(failList, filename)
            if err1 !=nil && err1.Error() == "NotFeatureFindError" {
               noFaceList = append(noFaceList, filename)
            } else if err1 !=nil && err1.Error() == "TooManyFaces" {
               multiFaceList = append(multiFaceList, filename)
            } else {
               failList = append(failList, filename)
            }
         } else {
            successList = append(successList, filename)
         }
@@ -844,13 +876,15 @@
   logger.Debug("切",len(fileHeaders),"张人脸用时：", time.Since(tAllStart))
   addResult["successList"] = successList
   addResult["failList"] = failList
   addResult["noFaceList"] = noFaceList
   addResult["multiFaceList"] = multiFaceList
   addResult["fields"] = extNames

   //if len(successList)>0 {
   if len(successList)>0 {
      util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
   //} else {
   //   util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
   //}
   } else {
      util.ResponseFormat(c, code.DbPersonUploadFail, addResult)
   }
}

type EsPersonSave struct {