From f990b2d04e653d32c5a17341782a1e0a0e90601d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 14:42:36 +0800
Subject: [PATCH] ---

---
 ruleserver/ruleToformula.go |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 808b1f3..dc43efe 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -238,10 +238,19 @@
 		if err1 != nil {
 			logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
 		}
-		baseinfo.CompareScore = val
+		baseinfo.CompareScore = Retain(val)
 		arg.Liker = append(arg.Liker, &baseinfo)
 	}
 	//logger.Info("------------------绗竴娆$湅args:",*arg)
+}
+// 淇濈暀鍥涗綅灏忔暟
+func Retain(f float32)(float32) {
+	s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
+	v, err := strconv.ParseFloat(s, 32)
+	if err != nil {
+		logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
+	}
+	return float32(v)
 }
 func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
 	compareFlag := 0
@@ -259,7 +268,7 @@
 		}
 	}
 	// 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
-	compareFlag = 1
+	//compareFlag = 1
 	if compareFlag == 0 {
 		logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
 		return
@@ -273,12 +282,14 @@
 						logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
 						// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽~鍏呭叾liker
 						if groupRule.Rules[j].PolygonId == areaMap.areaId {
+							logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
 							for _, arg := range areaMap.args {
 								if compareFlag == 1 {
 									arg.fillLiker()
 								}
 								if compareFlag == 2 {
 									array := strings.Split(tableIds, ",")
+									logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
 									for i := 0; i < len(array)-1; i++ {
 										arg.fillLiker()
 									}

--
Gitblit v1.8.0