From d94f80d854d09e89715ca7c2361cd6057f98f396 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期三, 31 七月 2019 17:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
controllers/fileController.go | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 9ad7591..f0eb62f 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -218,10 +218,15 @@
logger.Debug("arg.TableIds:", arg.TableIds, ",alarmLevel:",arg.AlarmLevel,",treeNodes:",arg.TreeNodes,",searchTime:",arg.SearchTime,
",inputValue:",arg.InputValue,",tasks:",arg.Tasks,",compThreshold:",arg.CompareThreshold)
+ timeStart := time.Now()
+
compareService := service.NewFaceCompareService(arg)
compareOnce := compareService.Compare()
//logger.Debug("compareResult.len:",*compareOnce)
dataList := compareOnce.CompareData
+
+ logger.Debug("comp 姣斿缁撴潫锛岀敤鏃讹細",time.Since(timeStart))
+
service.SortByScore(dataList)
totalList := len(dataList)
m := make(map[string]interface{},3)
@@ -232,6 +237,7 @@
} else {
m["totalList"] = dataList[0:searchBody.Size]
}
+ logger.Debug("comp 姣斿鍔犳帓搴忚繑鍥炵敤鏃�:", time.Since(timeStart))
util.ResponseFormat(c,code.Success,m)
}
}
@@ -277,7 +283,7 @@
resultList = append(resultList,cr)
}
}
- logger.Debug("GetCompareDataTwice.data:",resultList)
+ //logger.Debug("GetCompareDataTwice.data:",resultList)
service.SortByScore(resultList)
from := (arg.Page-1)*arg.Size
to := from + arg.Size
@@ -290,7 +296,8 @@
if to <= len(resultList) {
m["totalList"] = resultList[from:to]
} else {
- m["totalList"] = resultList[from:len(resultList)]
+ lte := len(resultList)
+ m["totalList"] = resultList[from:lte]
}
} else {
m["totalList"] = []service.CompareResult{}
--
Gitblit v1.8.0