fix alarmLevelId

liuxiaolong

2019-07-24 65eb96ecee8551a9328af7c6738769246b3f34f8

 controllers/fileController.go

@@ -2,6 +2,7 @@

import (
   "basic.com/pubsub/protomsg.git"
   "basic.com/fileServer/WeedFSClient.git"
   "bytes"
   "encoding/base64"
   "errors"
@@ -108,7 +109,6 @@
   faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*5)
   if err ==nil && len(faceArr) >0 {
      var faceBase64= ""
      var field = ""
      var rcFace *protomsg.Rect
      for _,r := range faceArr {
         rcFace = r.Pos.RcFace
@@ -117,19 +117,12 @@
      }
      //根据人脸坐标扣出人脸小图
      cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
      fileInfo, e := esutil.PostFormData(weedfsUri, "测试人脸切图", "file", cutFaceImgData)
      if e != nil {
         fmt.Println(e.Error())

      weedFilePath, e := WeedFSClient.UploadFile(weedfsUri, "testCutFace", cutFaceImgData)
      if e !=nil{
         util.ResponseFormat(c,code.ComError,"文件上传失败")
      } else {
         field = fileInfo[picUrlField].(string) // 文件路径
         util.ResponseFormat(c,code.Success,weedFilePath + ";" + faceBase64)
      }
      if strings.Contains(field,"/"){
         idx := strings.Index(field, "/")
         field = field[idx+1:]
      }
      fmt.Println("field:",field)
      util.ResponseFormat(c,code.Success,field + ";" + faceBase64)
   } else {
      util.ResponseFormat(c,code.ComError,"未提取到人脸")
   }
@@ -256,12 +249,10 @@
      field, _, err1 := uploadFileReturnAddr(file, filename, tableId)
      //extNames = append(extNames, field)

      if err1 != nil {
         if field == "" {
            failList = append(failList, filename+"上传失败,"+err1.Error())
         } else {
            successList = append(successList, filename+"加入底库失败,"+err1.Error())
         }
      if err1 != nil || field == "" {
         failList = append(failList, filename)
      } else {
         successList = append(successList, filename)
      }
   }
   addResult["successList"] = successList