From 06a5b7be21e8c05bf3695754fe6f4714a7fccd68 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 26 七月 2019 16:46:23 +0800
Subject: [PATCH] fix local and sync table
---
controllers/fileController.go | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 29839f6..394aebf 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/fileServer/WeedFSClient.git"
"basic.com/valib/deliver.git"
@@ -25,6 +26,7 @@
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
+ "webserver/extend/logger"
"webserver/extend/util"
"webserver/models"
"webserver/service"
@@ -180,92 +182,120 @@
}
var captureTable = "capturetable" // 鎶撴媿搴�
-type SearchCondition struct {
- Url string `json:"url"`
- TableIds []string `json:"tableIds"`
- CompThreshold string `json:"compThreshold"`
-}
// @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.Url == "" {
+ 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.CompThreshold,32)
- if condition.Url == "" || err != nil {
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ 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.Url];!ok{
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ if face,ok := faceExtractedMap[searchBody.PicUrl];!ok{
+ util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
return
} else {
arg := protomsg.CompareArgs{
- TableIds:[]string{ captureTable },
- FaceFeature:face.FaceBytes,
- CompareThreshold:float32(compThreshold),
+ FaceFeature: face.FaceBytes,
+ CompareThreshold: searchBody.Threshold,
}
- if condition.TableIds !=nil {
- arg.TableIds = append(arg.TableIds, condition.TableIds...)
+
+ 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,captureTable)
+ break
+ }
+ }
+ arg.TableIds = searchBody.DataBases
}
+ 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)
b, err := proto.Marshal(&arg)
if err !=nil{
util.ResponseFormat(c, code.ComError, "璇锋眰marshal澶辫触")
return
}
compServerList := config.CompServerInfo.Url
- fmt.Println("compServerList:", compServerList)
+ 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)
- var dbPersonM map[string]*protomsg.Esinfo
- var captureM map[string]*protomsg.Esinfo
- var personIds []string
- var captureIds []string
+ 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
- personIds = append(personIds,v.Id)
+ captureIds = append(captureIds,v.Id)
} else {
dbPersonM[v.Id] = &v
- captureIds = append(captureIds,v.Id)
+ personIds = append(personIds,v.Id)
}
}
+ 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: dbPersonM[p.Id].CompareScore,
+ CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
MonitorLevel: p.MonitorLevel,
PersonName: p.PersonName,
PersonPicUrl: p.PersonPicUrl,
@@ -284,6 +314,8 @@
resultList = append(resultList,cr)
}
}
+
+ logger.Debug("resultList:",resultList)
}
util.ResponseFormat(c,code.Success,resultList)
}
@@ -376,6 +408,7 @@
dbperson.PersonPicUrl = field // 鍥剧墖璺粡
dbperson.TableId = tableId //
dbperson.PersonName = fileNameOnly // 鍥剧墖鍚�
+ dbperson.Enable = 1 //榛樿鏈夋晥
// 婕旂ずbase64缂栫爜
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
@@ -456,7 +489,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