From f4acb3a3ef03f09813acf80445e4fb746d552887 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 30 七月 2019 11:32:03 +0800
Subject: [PATCH] fix taglist
---
controllers/fileController.go | 268 +++++++++++++++++++++++++++--------------------------
1 files changed, 138 insertions(+), 130 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 74d1b25..a82d000 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -1,16 +1,14 @@
package controllers
import (
- "basic.com/pubsub/protomsg.git"
+ "basic.com/dbapi.git"
"basic.com/fileServer/WeedFSClient.git"
- "basic.com/valib/deliver.git"
+ "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/base64"
- "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
- "github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
"image"
"image/jpeg"
@@ -29,7 +27,6 @@
"webserver/extend/util"
"webserver/models"
"webserver/service"
- esApi "basic.com/pubsub/esutil.git"
)
type FileController struct {
@@ -150,156 +147,166 @@
}
}
-type CompareResult struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraAddr string `json:"cameraAddr"`
- PicDate string `json:"picDate"`
- Content string `json:"content"`
- IsAlarm int `json:"isAlarm"`
- PicMaxUrl string `json:"picMaxUrl"`
- PicSmUrl []string `json:"picSmUrl"`
- Sex string `json:"sex"`
- AgeDescription string `json:"ageDescription"`
- Race string `json:"race"`
- TaskName string `json:"taskName"`
- BaseInfo []DbPersonVo `json:"baseInfo"`
- VideoUrl string `json:"videoUrl"`
-}
-type DbPersonVo struct {
- BwType string `json:"bwType"`
- CompareScore float32 `json:"compareScore"`
- IdCard string `json:"idCard"`
- MonitorLevel string `json:"monitorLevel"`
- PersonId string `json:"personId"`
- PersonName string `json:"personName"`
- PersonPicUrl string `json:"personPicUrl"`
- PhoneNum string `json:"phoneNum"`
- Sex string `json:"sex"`
- TableId string `json:"tableId"`
- TableName string `json:"tableName"`
-}
-
-var captureTable = "capturetable" // 鎶撴媿搴�
-type SearchCondition struct {
- PicUrl string `json:"picUrl"`
- Databases []string `json:"databases"`
- Threshold string `json:"threshold"`
-}
// @Summary 浠ュ浘鎼滃浘
// @Description 浠ュ浘鎼滃浘
// @Accept json
// @Produce json
// @Tags 浠ュ浘鎼滃浘
-// @Param condition body controllers.SearchCondition true "鎼滅储鍙傛暟"
+// @Param condition body models.EsSearch true "鎼滅储鍙傛暟"
// @Success 200 {string} json "{"code":200, msg:"", data:"", success:true}"
// @Failure 500 {string} json "{"code":500, msg:"", data:"", success:false}"
// @Router /data/api-v/dbperson/searchByPhoto [POST]
func (controller FileController) SearchByPhoto(c *gin.Context) {
- var condition SearchCondition
- err := c.BindJSON(&condition)
- if err !=nil || condition.PicUrl == "" || len(condition.Databases) == 0 {
+ var searchBody models.EsSearch
+ err := c.BindJSON(&searchBody)
+ if err !=nil || searchBody.PicUrl == "" || len(searchBody.DataBases) == 0 {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
- compThreshold, err := strconv.ParseFloat(condition.Threshold,32)
- if condition.PicUrl == "" || err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ if searchBody.CompareNum !="" {
+ //浜屾鎼滅储锛屼笉闇�瑕佸啀姣斿浜�
+ co := service.GetCompResultByNum(searchBody.CompareNum)
+ if co != nil {
+ //浜屾鎼滅储鍜屾帓搴�
+ twiceM := GetCompareDataTwice(co,&searchBody)
+ util.ResponseFormat(c,code.Success,twiceM)
+ } else {
+ m :=make(map[string]interface{},0)
+ m["compareNum"] = searchBody.CompareNum
+ m["total"] = 0
+ m["totalList"] = []service.CompareResult{}
+ util.ResponseFormat(c,code.CompareResultGone,m)
+ }
+ }
+ var sysSetApi dbapi.SysSetApi
+ analyServerId := ""
+ flag, sysconf := sysSetApi.GetServerInfo()
+ if flag {
+ analyServerId = sysconf.ServerId
+ } else {
+ util.ResponseFormat(c, code.ComError, "analyServerId涓虹┖锛岄厤缃湁璇�")
return
}
- if face,ok := faceExtractedMap[condition.PicUrl];!ok{
+ if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
return
} else {
arg := protomsg.CompareArgs{
- TableIds: condition.Databases,
FaceFeature: face.FaceBytes,
- CompareThreshold: float32(compThreshold),
+ CompareThreshold: searchBody.Threshold,
}
- if condition.Databases !=nil {
- arg.TableIds = append(arg.TableIds, condition.Databases...)
- }
- b, err := proto.Marshal(&arg)
- if err !=nil{
- util.ResponseFormat(c, code.ComError, "璇锋眰marshal澶辫触")
- return
- }
- compServerList := config.CompServerInfo.Url
- logger.Debug("compServerList:", compServerList)
- resultList :=make([]CompareResult,0)
- for _,str :=range compServerList{
- reqUrl := "tcp://"+str
- reqClient := deliver.NewClient(deliver.ReqRep, reqUrl)
- err = reqClient.Send(b)
- if err !=nil{
- logger.Debug("reqClient.Send err:",err)
- continue
- }
- resultB, err := reqClient.Recv()
- if err !=nil{
- logger.Debug("reqClient.Recv err:",err)
- continue
- }
- rList :=make([]protomsg.Esinfo,0)
- err = json.Unmarshal(resultB, &rList)
- if err !=nil{
- logger.Debug("recv result Unmarshal err:", err)
- continue
- }
- logger.Debug("rList:", rList)
- dbPersonM := make(map[string]*protomsg.Esinfo,0)
- captureM := make(map[string]*protomsg.Esinfo,0)
- personIds :=make([]string,0)
- captureIds := make([]string,0)
- for _,v :=range rList{
- if v.Tableid == captureTable {
- captureM[v.Id] = &v
- captureIds = append(captureIds,v.Id)
- } else {
- dbPersonM[v.Id] = &v
- personIds = append(personIds,v.Id)
+ if searchBody.DataBases !=nil {
+ for idx,tableId :=range searchBody.DataBases {
+ if tableId == "esData" {
+ searchBody.DataBases = append(searchBody.DataBases[:idx], searchBody.DataBases[idx+1:]...)
+ searchBody.DataBases = append(searchBody.DataBases,service.CaptureTable)
+ break
}
}
- logger.Debug("personIds:", personIds)
- logger.Debug("captureIds:",captureIds)
- 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)
- }
- logger.Debug("dbpersons:", dbpersons)
- if e ==nil && dbpersons !=nil {
- for _,p :=range dbpersons {
- var dbP = DbPersonVo {
- PersonId: p.Id,
- IdCard: p.IdCard,
- CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
- MonitorLevel: p.MonitorLevel,
- PersonName: p.PersonName,
- PersonPicUrl: p.PersonPicUrl,
- PhoneNum: p.PhoneNum,
- Sex: p.Sex,
- TableId: p.TableId,
- }
- dbTableInfos, _ := esApi.Dbtablefosbyid([]string{p.TableId}, config.EsInfo.EsIndex.DbTables.IndexName, esServerIp, esServerPort)
- if dbTableInfos !=nil{
- dbP.BwType = dbTableInfos[0].BwType
- dbP.TableName = dbTableInfos[0].TableName
- }
- var cr = CompareResult{
- BaseInfo:[]DbPersonVo{ dbP },
- }
- resultList = append(resultList,cr)
- }
- }
- logger.Debug("resultList:",resultList)
+ arg.TableIds = searchBody.DataBases
}
- util.ResponseFormat(c,code.Success,resultList)
+ arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
+ arg.AlarmLevel = searchBody.AlarmLevel
+ arg.Tasks = searchBody.Tasks
+ arg.TreeNodes = searchBody.TreeNodes
+ arg.Tabs = searchBody.Tabs
+ arg.SearchTime = searchBody.SearchTime
+ arg.InputValue = searchBody.InputValue
+ arg.Collection = searchBody.Collection
+ arg.AnalyServerId = analyServerId
+
+ logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
+ ",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
+ compareService := service.NewFaceCompareService(arg)
+ compareOnce := compareService.Compare()
+ logger.Debug("compareResult:",*compareOnce)
+ dataList := compareOnce.CompareData
+ service.SortByScore(dataList)
+ totalList := len(dataList)
+ m := make(map[string]interface{},3)
+ m["compareNum"] = compareOnce.CompareNum
+ m["total"] = totalList
+ if totalList <= searchBody.Size {
+ m["totalList"] = dataList
+ } else {
+ m["totalList"] = dataList[0:searchBody.Size]
+ }
+ util.ResponseFormat(c,code.Success,m)
}
}
+
+func GetCompareDataTwice(co *service.CompareOnce,arg *models.EsSearch) map[string]interface{} {
+ camIds := arg.TreeNodes
+ tabIds := arg.Tabs
+ taskIds := arg.Tasks
+ alarmLevels := arg.AlarmLevel
+ timeArr := arg.SearchTime
+ input := arg.InputValue
+ resultList := make([]service.CompareResult,0)
+ for _,cr :=range co.CompareData {
+ if cr.Id !=""{
+ n :=0
+ if len(camIds) == 0 || isInArr(cr.CameraId,camIds) {
+ n++
+ }
+ if len(tabIds) == 0 {
+ n++
+ }
+ if len(taskIds) == 0 || isInArr(cr.TaskId, taskIds) {
+ n++
+ }
+ //鍒ゆ柇鎶ヨ绛夌骇
+ if len(alarmLevels) == 0 {
+
+ }
+ n++
+ //鍒ゆ柇鏃堕棿
+ if len(timeArr) == 0 {
+
+ }
+ n++
+ if input == ""{
+
+ }
+ n++
+ if n == 6 {
+ resultList = append(resultList,cr)
+ }
+ } else {
+ resultList = append(resultList,cr)
+ }
+ }
+ logger.Debug("GetCompareDataTwice.data:",resultList)
+ service.SortByScore(resultList)
+ from := (arg.Page-1)*arg.Size
+ to := from + arg.Size
+ lenth := len(resultList)
+ m := make(map[string]interface{},0)
+ m["total"] = lenth
+ m["compareNum"] = arg.CompareNum
+
+ if from < len(resultList) {
+ if to <= len(resultList) {
+ m["totalList"] = resultList[from:to]
+ } else {
+ m["totalList"] = resultList[from:len(resultList)]
+ }
+ } else {
+ m["totalList"] = []service.CompareResult{}
+ }
+ return m
+}
+
+func isInArr(id string,arr []string) bool {
+ for _,v :=range arr {
+ if v == id {
+ return true
+ }
+ }
+ return false
+}
+
// @Description 浜哄憳鐓х墖涓婁紶骞惰幏鍙栫壒寰佸��
// @Router /data/api-v/dbperson/fileUploadTest [POST]
@@ -388,6 +395,7 @@
dbperson.PersonPicUrl = field // 鍥剧墖璺粡
dbperson.TableId = tableId //
dbperson.PersonName = fileNameOnly // 鍥剧墖鍚�
+ dbperson.Enable = 1 //榛樿鏈夋晥
// 婕旂ずbase64缂栫爜
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
@@ -468,7 +476,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())
}
--
Gitblit v1.8.0