Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

src/jy/extract/extractInit.go

@@ -526,7 +526,7 @@ func (e *ExtractTask) InitRuleCore(isSite bool) {
 					Field: field,
 					Code:  v["s_code"].(string),
 					Name:  v["s_name"].(string),
-					Score: v["s_default_score"].(float64),
+					Score: qu.Float64All(v["s_default_score"]),
 					IsLua: qu.If(v["s_type"].(string) == "1", true, false).(bool),
 				}
 				if rinfo.IsLua {

udp_winner/timedTaskAgency.go

@@ -65,7 +65,7 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 			num++
 
 			if num%10000==0 &&num>0{
-				log.Println("当前代理机构数量：",num)
+				log.Println("当前遍历数量数量：",num)
 			}
 
 			mgoId := tmp["_id"].(bson.ObjectId).Hex()
@@ -147,7 +147,6 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 						log.Println(err)
 					}
 					//拿到合并后的qyk
-					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_agency"], reply, nil)
 					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 						log.Println(redisCName, "存量 redis id 不存在", reply)

udp_winner/timedTaskBuyer.go

@@ -64,7 +64,7 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 		for cursor.Next(&tmp) {
 			num++
 			if num%10000==0 &&num>0{
-				log.Println("当前采购单位数量：",num)
+				log.Println("当前遍历数量：",num)
 			}
 
 			mgoId := tmp["_id"].(bson.ObjectId).Hex()
@@ -147,7 +147,6 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 						log.Println(err)
 					}
 					//拿到合并后的qyk
-					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_buyer"], reply, nil)
 					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
 						log.Println(redisCName, "存量 redis id 不存在", reply,"数据：",oldTmp)