From ba513511eb84549d7a3b5558f49df2bed6319be9 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 11 二月 2020 15:53:57 +0800
Subject: [PATCH] fix: sysconfig add nginx port
---
controllers/fileController.go | 141 +++++++++++++++++++++++++++++------------------
1 files changed, 87 insertions(+), 54 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index dc54ec3..7ac8606 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -132,7 +132,7 @@
logger.Debug("localConfig is wrong!!!")
return
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
logger.Debug("weedfsUri:",weedfsUri)
resultMap :=make(map[string]interface{},0)
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
@@ -183,17 +183,15 @@
type CompareResult struct {
Id string `json:"id"`
- CompareScore float32 `json:"compareScore"`
+ CompareScore float64 `json:"compareScore"`
CameraId string `json:"cameraId"`
+ CameraName string `json:"cameraName"`
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"`
+ IsAlarm bool `json:"isAlarm"`
+ PicMaxUrl []string `json:"picMaxUrl"`
+ TargetInfo []TargetInfo `json:"targetInfo"`
TaskId string `json:"taskId"`
TaskName string `json:"taskName"`
BaseInfo []DbPersonVo `json:"baseInfo"`
@@ -201,23 +199,37 @@
SdkName string `json:"sdkName"`
AlarmRules []AlarmRuleVo `json:"alarmRules"`
}
+
+type TargetInfo struct {
+ TargetId string `json:"targetId"`
+ TargetType string `json:"targetType"`
+ TargetScore float64 `json:"targetScore"`
+ Feature string `json:"feature"`
+ PicSmUrl string `json:"picSmUrl"`
+ TargetLocation TargetLocation `json:"targetLocation"`
+}
+
+type TargetLocation struct {
+ TopLeft protomsg.Location `json:"topLeft"`
+ BottomRight protomsg.Location `json:"bottomRight"`
+}
+
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"`
+ BwType string `json:"bwType"`
+ CompareScore float64 `json:"compareScore"`
+ TargetId string `json:"targetId"`
+ TargetName string `json:"targetName"`
+ TargetPicUrl string `json:"targetPicUrl"`
+ MonitorLevel string `json:"monitorLevel"`
+ Labels string `json:"labels"`
+ Content string `json:"content"`
Enable int32 `json:"enable"`
}
type ScoreIndex struct {
- CompareScore float32
+ CompareScore float64
Index int
}
@@ -242,13 +254,13 @@
if v.Tableid == service.CaptureTable {
captureM[v.Id] = ScoreIndex{
Index: idx,
- CompareScore: v.CompareScore,
+ CompareScore: util.ParseScore64(float64(v.CompareScore)),
}
captureIds = append(captureIds,v.Id)
} else {
dbPersonM[v.Id] = ScoreIndex{
Index: idx,
- CompareScore: v.CompareScore,
+ CompareScore: util.ParseScore64(float64(v.CompareScore)),
}
personIds = append(personIds,v.Id)
}
@@ -266,15 +278,14 @@
var dtApi dbapi.DbTableApi
for _,p :=range dbpersons {
var dbP = DbPersonVo {
- PersonId: p.Id,
- IdCard: p.IdCard,
- CompareScore: util.ParseScore(dbPersonM[p.Id].CompareScore),
+ TargetId: p.Id,
+ CompareScore: dbPersonM[p.Id].CompareScore,
MonitorLevel: p.MonitorLevel,
- PersonName: p.PersonName,
- PersonPicUrl: p.PersonPicUrl,
- PhoneNum: p.PhoneNum,
- Sex: p.Sex,
+ TargetName: p.PersonName,
+ TargetPicUrl: p.PersonPicUrl,
+ Labels: p.PhoneNum+"/"+p.Sex+"/"+p.IdCard,
TableId: p.TableId,
+ Content: p.Reserved,
Enable: p.Enable,
}
dbTableInfos, _ := dtApi.DbtablesById([]string{ p.TableId })
@@ -295,21 +306,18 @@
return nil
}
logger.Debug("captureIds:",strings.Join(captureIds,","))
- videopersons, _ := esApi.Videopersonsinfosbyid(captureIds, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
- logger.Debug("comp videoPersons.len:",len(videopersons))
- for _,vp :=range videopersons {
- isAlarmInt, _ := strconv.Atoi(vp.IsAlarm)
+ aiTargets, _ := esApi.AIOceaninfosbyid(captureIds, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
+ logger.Debug("comp aiTargets.len:",len(aiTargets))
+ for _,vp :=range aiTargets {
var bi []DbPersonVo
for _,p :=range vp.BaseInfo {
bi = append(bi, DbPersonVo{
- PersonId: p.PersonId,
- IdCard: p.IdCard,
- CompareScore: util.ParseScore(p.CompareScore),
- MonitorLevel: parseMonitorLevel(p.MonitorLevel),
- PersonName: p.PersonName,
- PersonPicUrl: p.PersonPicUrl,
- PhoneNum: p.PhoneNum,
- Sex: p.Sex,
+ TargetId: p.TargetId,
+ CompareScore: util.ParseScore64(p.CompareScore),
+ MonitorLevel: p.MonitorLevel,
+ TargetName: p.TargetName,
+ TargetPicUrl: p.TargetPicUrl,
+ Labels: p.Labels,
TableId: p.TableId,
BwType: p.BwType,
TableName: p.TableName,
@@ -328,18 +336,41 @@
})
}
}
+ var ti = make([]TargetInfo,0)
+ if vp.TargetInfo !=nil {
+ for _,vti :=range vp.TargetInfo {
+ tl := protomsg.Location{
+ X: vti.TargetLocation.TopLeft.X,
+ Y: vti.TargetLocation.TopLeft.Y,
+ }
+ br := protomsg.Location{
+ X: vti.TargetLocation.BottomRight.X,
+ Y: vti.TargetLocation.BottomRight.Y,
+ }
+ tInfo := TargetInfo{
+ TargetId: vti.TargetId,
+ TargetType: vti.TargetType,
+ TargetScore: vti.TargetScore,
+ Feature: vti.Feature,
+ PicSmUrl: vti.PicSmUrl,
+ TargetLocation: TargetLocation{
+ TopLeft:tl,
+ BottomRight:br,
+ },
+ }
+ ti = append(ti, tInfo)
+ }
+ }
vpE := CompareResult{
Id: vp.Id,
- CompareScore: util.ParseScore(captureM[vp.Id].CompareScore),
+ CompareScore: captureM[vp.Id].CompareScore,
CameraId: vp.CameraId,
+ CameraName: vp.CameraName,
CameraAddr: vp.CameraAddr,
PicDate: vp.PicDate,
PicMaxUrl: vp.PicMaxUrl,
- PicSmUrl: vp.PicSmUrl,
- IsAlarm: isAlarmInt,
- Sex: vp.Sex,
- AgeDescription: vp.AgeDescription,
- Race: vp.Race,
+ TargetInfo: ti,
+ IsAlarm: vp.IsAlarm,
TaskName: vp.TaskName,
TaskId: vp.TaskId,
VideoUrl: vp.VideoUrl,
@@ -372,7 +403,7 @@
logger.Debug("localConfig is wrong!!!")
return nil,"",nil,errors.New("localConf err")
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
logger.Debug("weedfsUri:",weedfsUri)
faceArr, err, pI := service.GetFaceFeaFromSdk(fileBytes, time.Second*60)
if err ==nil && len(faceArr) ==1 {
@@ -443,7 +474,7 @@
return
}
} else {
- searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CompTargetId, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
+ searchBase64Fea, err := esApi.GetVideoPersonFaceFeatureById(searchBody.CompTargetId, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)))
if err !=nil {
util.ResponseFormat(c, code.ComError, "鎶撴媿鏁版嵁涓嶅瓨鍦紝璇锋鏌�")
return
@@ -494,8 +525,9 @@
} else {
arg.TableIds = []string{}
}
+ alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
- arg.AlarmLevel = searchBody.AlarmLevel
+ arg.AlarmLevel = alarmLevelTypes
arg.Tasks = searchBody.Tasks
arg.TreeNodes = searchBody.TreeNodes
arg.Tabs = searchBody.Tabs
@@ -580,8 +612,9 @@
}
localConf, err := cache.GetServerInfo()
if err ==nil && localConf.AlarmIp != "" && localConf.ServerId != "" {
+ alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
- arg.AlarmLevel = searchBody.AlarmLevel
+ arg.AlarmLevel = alarmLevelTypes
arg.Tasks = searchBody.Tasks
arg.TreeNodes = searchBody.TreeNodes
arg.Tabs = searchBody.Tabs
@@ -589,8 +622,8 @@
arg.InputValue = searchBody.InputValue
arg.Collection = searchBody.Collection
arg.AnalyServerId = localConf.ServerId
- alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
- captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.VideoPersons.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), alarmLevelTypes)
+
+ captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), alarmLevelTypes)
logger.Debug("searchPhoto first Result.len:",len(*co.CompareData),"twice len(captureIds):",len(captureIds))
if captureIds !=nil {
var aResult protomsg.SdkCompareResult
@@ -709,7 +742,7 @@
logger.Debug("localConfig is wrong!!!")
return
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
//灏嗕笂浼犵殑鍥剧墖浜や汉鑴告娴嬪拰浜鸿劯鎻愬彇锛岃幏寰楃壒寰�
fileBytes, _ := ioutil.ReadAll(file)
@@ -773,7 +806,7 @@
logger.Debug("localConfig is wrong!!!")
return "",nil,err2
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
t1 := time.Now()
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
@@ -933,7 +966,7 @@
logger.Debug("localConfig is wrong!!!")
return
}
- var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit"
+ var weedfsUri = "http://"+localConf.WebPicIp+":"+strconv.Itoa(int(localConf.WebPicPort))+"/submit?collection=persistent"
{
uri := weedfsUri
fileInfo, e := esutil.PostFormBufferData(uri, filename, "file", uploadData)
--
Gitblit v1.8.0