|
@@ -11,7 +11,7 @@ import (
|
|
)
|
|
)
|
|
|
|
|
|
var (
|
|
var (
|
|
- Mgo, MgoH *mongodb.MongodbSim
|
|
|
|
|
|
+ Mgo, MgoH, MgoB *mongodb.MongodbSim
|
|
Sysconfig, bidddingConf, biddingHConf map[string]interface{}
|
|
Sysconfig, bidddingConf, biddingHConf map[string]interface{}
|
|
noFields string
|
|
noFields string
|
|
)
|
|
)
|
|
@@ -43,6 +43,18 @@ func Init() {
|
|
}
|
|
}
|
|
|
|
|
|
MgoH.InitPool()
|
|
MgoH.InitPool()
|
|
|
|
+
|
|
|
|
+ //bidding
|
|
|
|
+ MgoB = &mongodb.MongodbSim{
|
|
|
|
+ MongodbAddr: biddingHConf["addr"].(string),
|
|
|
|
+ Size: util.IntAllDef(biddingHConf["size"], 5),
|
|
|
|
+ DbName: "qfw",
|
|
|
|
+ UserName: biddingHConf["username"].(string),
|
|
|
|
+ Password: biddingHConf["password"].(string),
|
|
|
|
+ //Direct: true,
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ MgoB.InitPool()
|
|
noFields = util.ObjToString(Sysconfig["no_fields"])
|
|
noFields = util.ObjToString(Sysconfig["no_fields"])
|
|
}
|
|
}
|
|
|
|
|
|
@@ -117,8 +129,19 @@ func highMark() {
|
|
res := calculateFlag(taginfo, *fields) //返回标注的十进制数字
|
|
res := calculateFlag(taginfo, *fields) //返回标注的十进制数字
|
|
|
|
|
|
if data, ok := markedData["v_baseinfo"].(map[string]interface{}); ok {
|
|
if data, ok := markedData["v_baseinfo"].(map[string]interface{}); ok {
|
|
- if _, ok := data["id"]; !ok {
|
|
|
|
- continue
|
|
|
|
|
|
+ where := make(map[string]interface{})
|
|
|
|
+ if _, ok := data["id"]; ok {
|
|
|
|
+ bidd, _ := MgoB.FindById("bidding", util.ObjToString(data["id"]), nil)
|
|
|
|
+ if len(*bidd) > 0 {
|
|
|
|
+ where["_id"] = mongodb.StringTOBsonId(util.ObjToString(data["id"]))
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ bidd, _ := MgoB.FindById("bidding", mongodb.BsonIdToSId(markedData["_id"]), nil)
|
|
|
|
+ if len(*bidd) > 0 {
|
|
|
|
+ where["_id"] = mongodb.StringTOBsonId(util.ObjToString(data["id"]))
|
|
|
|
+ } else {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
}
|
|
}
|
|
data["field_bitvalue"] = res
|
|
data["field_bitvalue"] = res
|
|
data["i_comeintime"] = time.Now().Unix()
|
|
data["i_comeintime"] = time.Now().Unix()
|
|
@@ -133,9 +156,6 @@ func highMark() {
|
|
|
|
|
|
update := make(map[string]interface{})
|
|
update := make(map[string]interface{})
|
|
update["$set"] = data
|
|
update["$set"] = data
|
|
- where := map[string]interface{}{
|
|
|
|
- "_id": mongodb.StringTOBsonId(util.ObjToString(data["id"])),
|
|
|
|
- }
|
|
|
|
|
|
|
|
if !MgoH.Update(util.ObjToString(biddingHConf["coll"]), where, update, true, false) {
|
|
if !MgoH.Update(util.ObjToString(biddingHConf["coll"]), where, update, true, false) {
|
|
util.Debug("任务 ", task["s_groupname"], infoID, "入库错误,请检查")
|
|
util.Debug("任务 ", task["s_groupname"], infoID, "入库错误,请检查")
|