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

udp_winner/main.go

@@ -10,7 +10,7 @@ import (
 	mu "mfw/util"
 	"net"
 	"qfw/util"
-	"qfw/util/mongodb"
+	"qfw/common/src/qfw/util/mongodb"
 	"regexp"
 	"strconv"
 	"strings"
@@ -69,6 +69,7 @@ func init() {
 	initRdis()
 	initMongo()
 	initReg()
+
 }
 
 func main() {

udp_winner/timedTaskAgency.go

@@ -102,8 +102,8 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 					//redis不存在,存到临时表,定时任务处理
 					for _, vmap := range rValuesMaps {
 						vmap["_id"] = bson.ObjectIdHex(vmap["_id"].(string))
-						if err = FClient.SaveForOld("agency_new", vmap); err != nil {
-							log.Println("存量 FClient.Save err", err, vmap)
+						if errb := FClient.SaveByOriID("agency_new", vmap); !errb  {
+							log.Println("存量 FClient.Save err", errb, vmap)
 						}
 					}
 					//log.Println("get redis id err:定时任务处理", err, tmp)
@@ -223,8 +223,8 @@ func AddAgency(overid string, tmp map[string]interface{}) string {
 	rdb.Do("SELECT", redis_agency_db)
 	if reply, err := redis.String(rdb.Do("GET", agency)); err != nil {
 		//redis不存在存到临时表,定时任务处理
-		if err := FClient.SaveForOld("agency_new", tmp); err != nil {
-			log.Println("FClient.Save err", err, tmp)
+		if errb := FClient.SaveByOriID("agency_new", tmp); !errb {
+			log.Println("FClient.Save err", errb, tmp)
 		}
 		//log.Println("get redis id err:定时任务处理", err, tmp)
 		if err := rdb.Close(); err != nil {
@@ -413,8 +413,8 @@ func TimedTaskAgency() {
 							tmp["agency_err"] = 1
 						}
 						//匹配不到原始库,存入异常表删除临时表
-						if err := FClient.SaveForOld("agency_err", tmp); err != nil {
-							log.Println("存入异常表错误", err, tmp)
+						if errb := FClient.SaveByOriID("agency_err", tmp); !errb {
+							log.Println("存入异常表错误", errb, tmp)
 						}
 						if deleteNum := FClient.Del("agency_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
 							log.Println("删除临时表错误", deleteNum)

udp_winner/timedTaskBuyer.go

@@ -102,8 +102,8 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 					//redis不存在,存到临时表,定时任务处理
 					for _, vmap := range rValuesMaps {
 						vmap["_id"] = bson.ObjectIdHex(vmap["_id"].(string))
-						if err = FClient.SaveForOld("buyer_new", vmap); err != nil {
-							log.Println("存量 FClient.Save err", err, vmap)
+						if errb := FClient.SaveByOriID("buyer_new", vmap); !errb {
+							log.Println("存量 FClient.Save err", errb, vmap)
 						}
 					}
 					//log.Println("get redis id err:定时任务处理", err, tmp)
@@ -240,8 +240,8 @@ func AddBuyer(overid string, tmp map[string]interface{}) string {
 	rdb.Do("SELECT", redis_buyer_db)
 	if reply, err := redis.String(rdb.Do("GET", buyer)); err != nil {
 		//redis不存在存到临时表,定时任务处理
-		if err := FClient.SaveForOld("buyer_new", tmp); err != nil {
-			log.Println("FClient.Save err", err, tmp)
+		if errb := FClient.SaveByOriID("buyer_new", tmp); !errb {
+			log.Println("FClient.Save err", errb, tmp)
 		}
 		//log.Println("get redis id err:定时任务处理", err, tmp)
 		if err := rdb.Close(); err != nil {
@@ -448,8 +448,8 @@ func TimedTaskBuyer() {
 							tmp["buyer_err"] = 1
 						}
 						//匹配不到原始库,存入异常表删除临时表
-						if err := FClient.SaveForOld("buyer_err", tmp); err != nil {
-							log.Println("存入异常表错误", err, tmp)
+						if errb := FClient.SaveByOriID("buyer_err", tmp); !errb{
+							log.Println("存入异常表错误", errb, tmp)
 						}
 						if deleteNum := FClient.Del("buyer_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
 							log.Println("删除临时表错误", deleteNum)

udp_winner/timedTaskWinner.go

@@ -100,8 +100,8 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 					//redis不存在,存到临时表,定时任务处理
 					for _, vmap := range rValuesMaps {
 						vmap["_id"] = bson.ObjectIdHex(vmap["_id"].(string))
-						if err = FClient.SaveForOld("winner_new", vmap); err != nil {
-							log.Println("存量 FClient.Save err", err, vmap)
+						if errb := FClient.SaveByOriID("winner_new", vmap); !errb {
+							log.Println("存量 FClient.Save err", errb, vmap)
 						}
 					}
 					//log.Println("get redis id err:定时任务处理", err, tmp)
@@ -228,8 +228,8 @@ func Add(overid string, tmp map[string]interface{}) string {
 	rdb.Do("SELECT", redis_winner_db)
 	if reply, err := redis.String(rdb.Do("GET", winner)); err != nil {
 		//redis不存在存到临时表,定时任务处理
-		if err := FClient.SaveForOld("winner_new", tmp); err != nil {
-			log.Println("FClient.Save err", err, tmp)
+		if errb := FClient.SaveByOriID("winner_new", tmp); !errb {
+			log.Println("FClient.Save err", errb, tmp)
 		}
 		//log.Println("get redis id err:定时任务处理", err, tmp)
 		if err := rdb.Close(); err != nil {
@@ -428,8 +428,8 @@ func TimedTaskWinner() {
 							tmp["winner_err"] = 1
 						}
 						//匹配不到原始库,存入异常表删除临时表
-						if err := FClient.SaveForOld("winner_err", tmp); err != nil {
-							log.Println("存入异常表错误", err, tmp)
+						if errb := FClient.SaveByOriID("winner_err", tmp); !errb {
+							log.Println("存入异常表错误", errb, tmp)
 						}
 						if deleteNum := FClient.Del("winner_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
 							log.Println("删除临时表错误", deleteNum)