|
@@ -190,7 +190,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
}
|
|
|
(*oldTmp)["contact"] = contactMaps
|
|
|
//mongo更新
|
|
|
- (*oldTmp)["comeintime"] = time.Now().Unix()
|
|
|
+ (*oldTmp)["updatatime"] = time.Now().Unix()
|
|
|
if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
|
|
|
log.Println("存量 mongo更新 err", esId, oldTmp)
|
|
|
}
|
|
@@ -217,7 +217,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
}
|
|
|
|
|
|
//增量
|
|
|
-func Add(overid string, tmp map[string]interface{}) string{
|
|
|
+func Add(overid string, tmp map[string]interface{}) string {
|
|
|
overid = tmp["_id"].(bson.ObjectId).Hex()
|
|
|
winner, ok := tmp["winner"].(string)
|
|
|
if !ok || utf8.RuneCountInString(winner) < 4 {
|
|
@@ -243,7 +243,7 @@ func Add(overid string, tmp map[string]interface{}) string{
|
|
|
//拿到合并后的qyk
|
|
|
oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, bson.M{})
|
|
|
if !b || (*oldTmp) == nil || reply == "" || (*oldTmp)["_id"] == nil {
|
|
|
- log.Println("redis id 不存在",reply)
|
|
|
+ log.Println("redis id 不存在", reply)
|
|
|
return overid
|
|
|
}
|
|
|
//比较合并 行业类型
|
|
@@ -277,7 +277,7 @@ func Add(overid string, tmp map[string]interface{}) string{
|
|
|
esId := (*oldTmp)["_id"].(bson.ObjectId).Hex()
|
|
|
//更新行业类型
|
|
|
if tmp["winnerperson"] == nil || tmp["winnerperson"] == "" || Reg_xing.MatchString(util.ObjToString(tmp["winnerperson"])) {
|
|
|
- (*oldTmp)["comeintime"] = time.Now().Unix()
|
|
|
+ (*oldTmp)["updatatime"] = time.Now().Unix()
|
|
|
//mongo更新
|
|
|
if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
|
|
|
log.Println("mongo更新err", esId)
|
|
@@ -298,10 +298,10 @@ func Add(overid string, tmp map[string]interface{}) string{
|
|
|
}
|
|
|
}
|
|
|
var tmpperson, winnertel string
|
|
|
- if tmppersona, ok := tmp["winnerperson"].(string); ok &&tmpperson!=""&&Reg_person.MatchString(tmpperson)&&!Reg_xing.MatchString(tmpperson){
|
|
|
+ if tmppersona, ok := tmp["winnerperson"].(string); ok && tmpperson != "" && Reg_person.MatchString(tmpperson) && !Reg_xing.MatchString(tmpperson) {
|
|
|
tmpperson = tmppersona
|
|
|
}
|
|
|
- if tmpperson!=""{
|
|
|
+ if tmpperson != "" {
|
|
|
if winnerteltmp, ok := tmp["winnertel"].(string); ok {
|
|
|
winnertel = winnerteltmp
|
|
|
}
|
|
@@ -326,7 +326,7 @@ func Add(overid string, tmp map[string]interface{}) string{
|
|
|
}
|
|
|
(*oldTmp)["contact"] = contactMaps
|
|
|
//mongo更新
|
|
|
- (*oldTmp)["comeintime"] = time.Now().Unix()
|
|
|
+ (*oldTmp)["updatatime"] = time.Now().Unix()
|
|
|
if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
|
|
|
log.Println("mongo更新 err", esId, oldTmp)
|
|
|
}
|
|
@@ -380,7 +380,7 @@ func TimedTaskWinner() {
|
|
|
rdb.Do("SELECT", redis_winner_db)
|
|
|
if _, err := redis.String(rdb.Do("GET", errwinner)); err == nil {
|
|
|
//增量合并
|
|
|
- Add(tmpId,tmp)
|
|
|
+ Add(tmpId, tmp)
|
|
|
//存在的话删除tmp mongo表
|
|
|
if DeletedCount := FClient.Del("winner_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
|
|
|
log.Println("删除临时表err:", DeletedCount)
|
|
@@ -611,34 +611,23 @@ func TimedTaskWinner() {
|
|
|
}
|
|
|
//tmps = append(tmps, savetmp)
|
|
|
savetmp["comeintime"] = time.Now().Unix()
|
|
|
+ savetmp["updatatime"] = time.Now().Unix()
|
|
|
//保存mongo
|
|
|
saveid := FClient.Save(Config["mgo_qyk_c"], savetmp)
|
|
|
if saveid != "" {
|
|
|
//保存redis
|
|
|
rc := RedisPool.Get()
|
|
|
rc.Do("SELECT", redis_winner_db)
|
|
|
- //var _id string
|
|
|
- //if v, ok := saveid.(primitive.ObjectID); ok {
|
|
|
- // _id = v.Hex()
|
|
|
- //}
|
|
|
if _, err := rc.Do("SET", savetmp["company_name"], saveid); err != nil {
|
|
|
log.Println("save redis err:", tmp["_id"], savetmp["_id"], savetmp["company_name"], err)
|
|
|
- if err := rc.Close(); err != nil {
|
|
|
- log.Println(err)
|
|
|
- }
|
|
|
} else {
|
|
|
- //保存es
|
|
|
- delete(savetmp, "_id")
|
|
|
- if err := rc.Close(); err != nil {
|
|
|
- log.Println(err)
|
|
|
+ //删除临时表
|
|
|
+ if deleteNum := FClient.Del("winner_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
+ log.Println("删除临时表失败", deleteNum)
|
|
|
}
|
|
|
-
|
|
|
- //esConn := elastic.GetEsConn()
|
|
|
- //defer elastic.DestoryEsConn(esConn)
|
|
|
- //删除临时表
|
|
|
- if deleteNum := FClient.Del("winner_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !deleteNum {
|
|
|
- log.Println("删除临时表失败", deleteNum)
|
|
|
- }
|
|
|
+ }
|
|
|
+ if err := rc.Close(); err != nil {
|
|
|
+ log.Println(err)
|
|
|
}
|
|
|
} else {
|
|
|
log.Println("save mongo err:", saveid, tmp["_id"])
|