fix bug

liuxiaolong

2019-07-26 faf0c4936c36695bac0c7e37a1b7f383c6e0984a

 controllers/fileController.go

@@ -159,10 +159,11 @@
   Content string `json:"content"`
   IsAlarm int `json:"isAlarm"`
   PicMaxUrl string `json:"picMaxUrl"`
   PicSmUrl []string `json:"picSmUrl"`
   PicSmUrl string `json:"picSmUrl"`
   Sex string `json:"sex"`
   AgeDescription string `json:"ageDescription"`
   Race string `json:"race"`
   TaskId string `json:"taskId"`
   TaskName string `json:"taskName"`
   BaseInfo []DbPersonVo `json:"baseInfo"`
   VideoUrl string `json:"videoUrl"`
@@ -215,9 +216,10 @@
         FaceFeature: face.FaceBytes,
         CompareThreshold: searchBody.Threshold,
      }

      if searchBody.DataBases !=nil {
         for idx,tableId :=range searchBody.DataBases {
            if tableId == captureTable{
            if tableId == "esData" {
               searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
               searchBody.DataBases = append(searchBody.DataBases,captureTable)
               break
@@ -284,12 +286,13 @@
         esServerIp := config.EsInfo.Masterip
         esServerPort := config.EsInfo.Httpport
         index := config.EsInfo.EsIndex.Dbtablepersons.IndexName
         dbpersons, e := esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
         if e !=nil {
            logger.Debug("Dbpersoninfosbyid.err:",e)
         var dbpersons []protomsg.Dbperson
         if len(personIds) >0 {
            dbpersons, _ = esApi.Dbpersoninfosbyid(personIds, index, esServerIp, esServerPort)
         }

         logger.Debug("dbpersons:", dbpersons)
         if e ==nil && dbpersons !=nil {
         if dbpersons !=nil {
            for _,p :=range dbpersons {
               var dbP = DbPersonVo {
                  PersonId: p.Id,
@@ -313,6 +316,47 @@
               resultList = append(resultList,cr)
            }
         }
         var capturePersons []protomsg.Videopersons
         if len(captureIds) >0 {
            logger.Debug("capturePersons:", capturePersons)
            videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, config.EsInfo.Masterip, config.EsInfo.Httpport)
            logger.Debug("videoPersons.len:",len(videopersons))
            for _,vp :=range videopersons {
               isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
               var bi []DbPersonVo
               for _,p :=range vp.BaseInfo {
                  bi = append(bi, DbPersonVo{
                     PersonId: p.PersonId,
                     IdCard: p.IdCard,
                     CompareScore: util.ParseScore(captureM[p.PersonId].CompareScore),
                     MonitorLevel: p.MonitorLevel,
                     PersonName: p.PersonName,
                     PersonPicUrl: p.PersonPicUrl,
                     PhoneNum: p.PhoneNum,
                     Sex: p.Sex,
                     TableId: p.TableId,
                  })
               }
               vpE := CompareResult{
                  Id: vp.Id,
                  CameraId: vp.CameraId,
                  CameraAddr: vp.CameraAddr,
                  PicDate: vp.PicDate,
                  PicMaxUrl: vp.PicMaxUrl,
                  PicSmUrl: vp.PicSmUrl,
                  IsAlarm: isAlarmInt,
                  Sex: vp.Sex,
                  AgeDescription: vp.AgeDescription,
                  Race: vp.Race,
                  TaskName: vp.TaskName,
                  TaskId: vp.TaskId,
                  VideoUrl: vp.VideoUrl,
                  BaseInfo: bi,
               }
               resultList = append(resultList,vpE)
            }
         }

         logger.Debug("resultList:",resultList)
      }
      util.ResponseFormat(c,code.Success,resultList)
@@ -406,6 +450,7 @@
   dbperson.PersonPicUrl = field //  图片路经
   dbperson.TableId = tableId           //
   dbperson.PersonName = fileNameOnly       // 图片名
   dbperson.Enable = 1 //默认有效
   // 演示base64编码

   dbperson.FaceFeature = faceBase64 // 特征值base64 码
@@ -486,7 +531,7 @@
   //addResult["detail"] = details
   //fields := fdfsclient.UploadFileByBuffer100(bytess, extNames)     //  fastdfs 上传
   if len(successList)>0 {
      util.ResponseFormat(c, code.Success, addResult)
      util.ResponseFormat(c, code.DbPersonUploadSuccess, addResult)
   } else {
      util.ResponseFormat(c, code.ServiceInsideError, err.Error())
   }