|
@@ -185,7 +185,7 @@ func task(mapinfo *map[string]interface{}) {
|
|
log.Println(err)
|
|
log.Println(err)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- overid := ""
|
|
|
|
|
|
+ overid := gtid
|
|
c2, _ := context.WithTimeout(context.Background(), 9999*time.Hour)
|
|
c2, _ := context.WithTimeout(context.Background(), 9999*time.Hour)
|
|
for cursor.Next(c2) {
|
|
for cursor.Next(c2) {
|
|
if err := cursor.Err(); err != nil {
|
|
if err := cursor.Err(); err != nil {
|
|
@@ -196,6 +196,7 @@ func task(mapinfo *map[string]interface{}) {
|
|
if tmp["winner"] == nil || tmp["winner"] == "" {
|
|
if tmp["winner"] == nil || tmp["winner"] == "" {
|
|
continue
|
|
continue
|
|
}
|
|
}
|
|
|
|
+ overid = tmp["_id"].(primitive.ObjectID).Hex()
|
|
//redis查询是否存在
|
|
//redis查询是否存在
|
|
rdb := RedisPool.Get()
|
|
rdb := RedisPool.Get()
|
|
if reply, err := redis.String(rdb.Do("GET", tmp["winner"])); err != nil {
|
|
if reply, err := redis.String(rdb.Do("GET", tmp["winner"])); err != nil {
|
|
@@ -237,7 +238,7 @@ func task(mapinfo *map[string]interface{}) {
|
|
tmpTopscopeclass := []string{}
|
|
tmpTopscopeclass := []string{}
|
|
tmpTopscopeclassMap := make(map[string]bool)
|
|
tmpTopscopeclassMap := make(map[string]bool)
|
|
log.Println(tmp["_id"])
|
|
log.Println(tmp["_id"])
|
|
- overid = tmp["_id"].(primitive.ObjectID).Hex()
|
|
|
|
|
|
+
|
|
if oldTmp["industry"] == nil {
|
|
if oldTmp["industry"] == nil {
|
|
//log.Println(reflect.ValueOf(tmp["topscopeclass"]))
|
|
//log.Println(reflect.ValueOf(tmp["topscopeclass"]))
|
|
if v, ok := tmp["topscopeclass"].(primitive.A); ok {
|
|
if v, ok := tmp["topscopeclass"].(primitive.A); ok {
|
|
@@ -372,6 +373,7 @@ func task(mapinfo *map[string]interface{}) {
|
|
log.Println(e)
|
|
log.Println(e)
|
|
}
|
|
}
|
|
log.Println("重新发送udp:", string(by))
|
|
log.Println("重新发送udp:", string(by))
|
|
|
|
+ return
|
|
}
|
|
}
|
|
log.Println("合并执行完成 ok", gtid, lteid, overid)
|
|
log.Println("合并执行完成 ok", gtid, lteid, overid)
|
|
|
|
|