From aa1b946f4ba9b62dee9b9464ff4450ebbc48c4ec Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 25 七月 2019 16:32:13 +0800
Subject: [PATCH] fix score to %.2f
---
controllers/fileController.go | 12 ++++++------
extend/util/util.go | 5 +++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 3e6fe46..74d1b25 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -198,7 +198,7 @@
func (controller FileController) SearchByPhoto(c *gin.Context) {
var condition SearchCondition
err := c.BindJSON(&condition)
- if err !=nil || condition.PicUrl == "" {
+ if err !=nil || condition.PicUrl == "" || len(condition.Databases) == 0 {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
return
}
@@ -208,13 +208,13 @@
return
}
if face,ok := faceExtractedMap[condition.PicUrl];!ok{
- util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ util.ResponseFormat(c, code.RequestParamError, "璇烽噸鏂颁笂浼犲浘鐗�")
return
} else {
arg := protomsg.CompareArgs{
- TableIds:[]string{ captureTable },
- FaceFeature:face.FaceBytes,
- CompareThreshold:float32(compThreshold),
+ TableIds: condition.Databases,
+ FaceFeature: face.FaceBytes,
+ CompareThreshold: float32(compThreshold),
}
if condition.Databases !=nil {
arg.TableIds = append(arg.TableIds, condition.Databases...)
@@ -276,7 +276,7 @@
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,
diff --git a/extend/util/util.go b/extend/util/util.go
index cc2dd98..84e0527 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -189,4 +189,9 @@
}
}
return buffer.String()
+}
+
+func ParseScore(compareScore float32) float32 {
+ f, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", compareScore*100), 32)
+ return float32(f)
}
\ No newline at end of file
--
Gitblit v1.8.0