|
@@ -102,7 +102,7 @@ func TaskAgency(mapinfo *map[string]interface{}) {
|
|
|
//redis不存在,存到临时表,定时任务处理
|
|
|
for _, vmap := range rValuesMaps {
|
|
|
vmap["_id"] = bson.ObjectIdHex(vmap["_id"].(string))
|
|
|
- if errb := FClient.SaveByOriID("agency_new", vmap); !errb {
|
|
|
+ if errb := FClient.SaveByOriID(Config["mgo_qyk_c_a_new"], vmap); !errb {
|
|
|
log.Println("存量 FClient.Save err", errb, vmap)
|
|
|
}
|
|
|
}
|
|
@@ -223,7 +223,7 @@ 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 errb := FClient.SaveByOriID("agency_new", tmp); !errb {
|
|
|
+ if errb := FClient.SaveByOriID(Config["mgo_qyk_c_a_new"], tmp); !errb {
|
|
|
log.Println("FClient.Save err", errb, tmp)
|
|
|
}
|
|
|
//log.Println("get redis id err:定时任务处理", err, tmp)
|
|
@@ -331,7 +331,7 @@ func TimedTaskAgency() {
|
|
|
for range t2.C {
|
|
|
Fcconn := FClient.GetMgoConn(86400)
|
|
|
tmpLast := map[string]interface{}{}
|
|
|
- if iter := Fcconn.DB(Config["mgodb_extract_kf"]).C("agency_new").Find(bson.M{}).Sort("-_id").Limit(1).Iter(); iter != nil {
|
|
|
+ if iter := Fcconn.DB(Config["mgodb_extract_kf"]).C(Config["mgo_qyk_c_a_new"]).Find(bson.M{}).Sort("-_id").Limit(1).Iter(); iter != nil {
|
|
|
if !iter.Next(&tmpLast) {
|
|
|
//临时表无数据
|
|
|
log.Println("临时表无数据:")
|
|
@@ -341,7 +341,7 @@ func TimedTaskAgency() {
|
|
|
} else {
|
|
|
log.Println("临时表有数据:", tmpLast["_id"])
|
|
|
fconn := FClient.GetMgoConn(86400)
|
|
|
- cursor := fconn.DB(Config["mgodb_extract_kf"]).C("agency_new").Find(bson.M{
|
|
|
+ cursor := fconn.DB(Config["mgodb_extract_kf"]).C(Config["mgo_qyk_c_a_new"]).Find(bson.M{
|
|
|
"_id": bson.M{
|
|
|
"$lte": tmpLast["_id"],
|
|
|
},
|
|
@@ -367,7 +367,7 @@ func TimedTaskAgency() {
|
|
|
//增量合并
|
|
|
AddAgency(tmpId, tmp)
|
|
|
//存在的话删除tmp mongo表
|
|
|
- if DeletedCount := FClient.Del("agency_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
|
|
|
+ if DeletedCount := FClient.Del(Config["mgo_qyk_c_a_new"], bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
|
|
|
log.Println("删除临时表err:", DeletedCount)
|
|
|
}
|
|
|
if err := rdb.Close(); err != nil {
|
|
@@ -413,10 +413,10 @@ func TimedTaskAgency() {
|
|
|
tmp["agency_err"] = 1
|
|
|
}
|
|
|
//匹配不到原始库,存入异常表删除临时表
|
|
|
- if errb := FClient.SaveByOriID("agency_err", tmp); !errb {
|
|
|
+ if errb := FClient.SaveByOriID(Config["mgo_qyk_c_a_err"], tmp); !errb {
|
|
|
log.Println("存入异常表错误", errb, tmp)
|
|
|
}
|
|
|
- if deleteNum := FClient.Del("agency_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
+ if deleteNum := FClient.Del(Config["mgo_qyk_c_a_new"], bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
log.Println("删除临时表错误", deleteNum)
|
|
|
}
|
|
|
continue
|
|
@@ -586,7 +586,7 @@ func TimedTaskAgency() {
|
|
|
log.Println("save redis err:", tmp["_id"], savetmp["_id"], savetmp["agency_name"], err)
|
|
|
} else {
|
|
|
//删除临时表
|
|
|
- if deleteNum := FClient.Del("agency_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
+ if deleteNum := FClient.Del(Config["mgo_qyk_c_a_new"], bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
log.Println("删除临时表失败", deleteNum)
|
|
|
}
|
|
|
}
|