fengweiqiang 5 years ago
parent
commit
6267ed04b2
2 changed files with 38 additions and 40 deletions
  1. 2 1
      udp_city/src/config.json
  2. 36 39
      udp_city/src/main.go

+ 2 - 1
udp_city/src/config.json

@@ -4,8 +4,9 @@
   "dbsize": 3,
   "dbsize": 3,
   "dbname": "enterprise",
   "dbname": "enterprise",
   "mgodb_bidding": "192.168.3.207:27092",
   "mgodb_bidding": "192.168.3.207:27092",
-  "mgodb_bidding_xs": "10.172.242.243:27080",
+  "mgodb_bidding_xs": "172.17.4.187:27083",
   "dbname_bidding": "qfw",
   "dbname_bidding": "qfw",
+  "findDb": "result_20200714",
   "udpport": "1485",
   "udpport": "1485",
   "nextNode": [
   "nextNode": [
     {
     {

+ 36 - 39
udp_city/src/main.go

@@ -78,7 +78,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 
 
 func getCity(sid, eid, rep string) {
 func getCity(sid, eid, rep string) {
 	index := 0
 	index := 0
-	unum := 0
+	var unum int64
 	query := bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(sid), "$lte": bson.ObjectIdHex(eid)}}
 	query := bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(sid), "$lte": bson.ObjectIdHex(eid)}}
 	count := mgo.Mgo_Bidding.Count(findDb, query)
 	count := mgo.Mgo_Bidding.Count(findDb, query)
 	log.Println("查询条件为:", query, "查询条数:", count)
 	log.Println("查询条件为:", query, "查询条数:", count)
@@ -92,51 +92,48 @@ func getCity(sid, eid, rep string) {
 		query = bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(sid), "$lte": bson.ObjectIdHex(eid)}}
 		query = bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(sid), "$lte": bson.ObjectIdHex(eid)}}
 		log.Printf("page=%d,query=%v,db=%v\n", i+1, query, table)
 		log.Printf("page=%d,query=%v,db=%v\n", i+1, query, table)
 		list, _ := mgo.Mgo_Bidding.Find(table, query, nil, biddingFields, false, 0, limit)
 		list, _ := mgo.Mgo_Bidding.Find(table, query, nil, biddingFields, false, 0, limit)
-		processingCity(sid, eid, list, index, table, i,unum)
-	}
-}
+		for _, v := range *list {
+			if qu.ObjToString(v["district"]) != "" && qu.ObjToString(v["city"]) != "" && qu.ObjToString(v["area"]) != "" {
+				index++
+				continue
+			}
+			if qu.ObjToString(v["buyer"]) == "" {
+				index++
+				continue
+			}
 
 
-func processingCity(sid string, eid string, list *[]map[string]interface{}, index int, table string, i,unum int) {
-	for _, v := range *list {
-		if qu.ObjToString(v["district"]) != "" && qu.ObjToString(v["city"]) != "" && qu.ObjToString(v["area"]) != "" {
-			index++
-			continue
-		}
-		if qu.ObjToString(v["buyer"]) == "" {
-			index++
-			continue
-		}
+			_id := qu.BsonIdToSId(v["_id"])
+			rdata := cityMarshal(v)
+			if len(rdata) > 0 {
+				umap := make(map[string]interface{})
+				if v["modifyinfo"] == nil {
+					umap["modifyinfo"] = make(map[string]interface{})
+				} else {
+					umap["modifyinfo"] = v["modifyinfo"]
+				}
+				for rk, rv := range rdata {
+					umap[rk] = rv
+					umap["modifyinfo"].(map[string]interface{})[rk] = "企业信息"
+				}
+				unum++
+				log.Println(unum,",id:",_id)
+				mgo.Mgo_Bidding.UpdateById(table, v["_id"], map[string]interface{}{
+					"$set": umap,
+				})
 
 
-		_id := qu.BsonIdToSId(v["_id"])
-		rdata := cityMarshal(v)
-		if len(rdata) > 0 {
-			umap := make(map[string]interface{})
-			if v["modifyinfo"] == nil {
-				umap["modifyinfo"] = make(map[string]interface{})
-			} else {
-				umap["modifyinfo"] = v["modifyinfo"]
 			}
 			}
-			for rk, rv := range rdata {
-				umap[rk] = rv
-				umap["modifyinfo"].(map[string]interface{})[rk] = "企业信息"
+			index++
+			if index%1000 == 0 {
+				log.Println("index:", index, ",页码:", i+1, ",_id:", _id)
+			}
+			sid = _id
+			if sid >= eid {
+				break
 			}
 			}
-			unum++
-			log.Println(unum,",id:",_id)
-			mgo.Mgo_Bidding.UpdateById(table, v["_id"], map[string]interface{}{
-				"$set": umap,
-			})
-
-		}
-		index++
-		if index%1000 == 0 {
-			log.Println("index:", index, ",页码:", i+1, ",_id:", _id)
-		}
-		sid = _id
-		if sid >= eid {
-			break
 		}
 		}
 	}
 	}
 }
 }
+
 func cityMarshal(data map[string]interface{}) map[string]string {
 func cityMarshal(data map[string]interface{}) map[string]string {
 	rdata := make(map[string]string)
 	rdata := make(map[string]string)
 	buyer := qu.ObjToString(data["buyer"])
 	buyer := qu.ObjToString(data["buyer"])