字段

udp_city/src/main.go

@@ -15,7 +15,7 @@ var Udpclient mu.UdpClient //udp对象
 var nextNodes []map[string]interface{}
 var Config map[string]interface{}
 var PageSize = 5000 //查询分页
-var biddingFields = `{"buyer":1,"modifyinfo":1}`
+var biddingFields = `{"buyer":1,"modifyinfo":1,"area":1,"province":1,"city":1,"district":1}`
 var qyxyFields = `{"company_code":1,"province":1,"city":1,"district":1}`
 var findDb string
 var cc chan bool = make(chan bool, 5)
@@ -95,7 +95,7 @@ func getCity(sid, eid, rep string) {
 		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)
 		for _, v := range *list {
-			if qu.ObjToString(v["district"]) != "" && qu.ObjToString(v["city"]) != "" && qu.ObjToString(v["area"]) != "" {
+			if qu.ObjToString(v["district"]) != "" && qu.ObjToString(v["city"]) != "" && qu.ObjToString(v["area"]) != "" && qu.ObjToString(v["area"]) != "全国" {
 				index++
 				continue
 			}
@@ -149,15 +149,15 @@ func cityMarshal(data map[string]interface{}) map[string]string {
 	company_code := qu.ObjToString((*tmp)["company_code"])
 	if len(company_code) > 5 {
 		province_city_district, _ := mgo.Mgo.FindOne("address", `{"code":"`+company_code[:6]+`"}`)
-		if province_city_district != nil && (*province_city_district) != nil {
-			if qu.ObjToString(data["area"]) == "" {
+		if province_city_district != nil && (*province_city_district) != nil && (*province_city_district)["Remarks"] != "废除" {
+			if qu.ObjToString(data["area"]) == "" || qu.ObjToString(data["area"]) == "全国" {
 				if province := qu.ObjToString((*province_city_district)["province"]); province != "" {
 					rdata["area"] = province
 				}
 				if city := qu.ObjToString((*province_city_district)["city"]); city != "" && !strings.Contains(city, rdata["area"]) {
 					rdata["city"] = city
 				}
-				if district := qu.ObjToString((*province_city_district)["district"]); district != "" && !strings.Contains(district, rdata["area"])&& !strings.Contains(district, rdata["city"]) {
+				if district := qu.ObjToString((*province_city_district)["district"]); district != "" && !strings.Contains(district, rdata["area"]) && !strings.Contains(district, rdata["city"]) {
 					rdata["district"] = district
 				}
 			} else if qu.ObjToString(data["city"]) == "" && qu.ObjToString((*province_city_district)["province"]) != "" && qu.ObjToString((*province_city_district)["province"]) == qu.ObjToString(data["area"]) {
@@ -176,7 +176,7 @@ func cityMarshal(data map[string]interface{}) map[string]string {
 		}
 	}
 	var province string
-	if qu.ObjToString(data["area"]) == "" {
+	if qu.ObjToString(data["area"]) == "" || qu.ObjToString(data["area"]) == "全国" {
 		if province = qu.ObjToString((*tmp)["province"]); province != "" {
 			province = strings.TrimRight(province, "省")
 			province = strings.TrimRight(province, "市")
@@ -189,14 +189,14 @@ func cityMarshal(data map[string]interface{}) map[string]string {
 			rdata["district"] = district
 		}
 	} else if qu.ObjToString(data["city"]) == "" && province != "" && qu.ObjToString(data["area"]) == province {
-		if city := qu.ObjToString((*tmp)["city"]); city != "" && province !=city{
+		if city := qu.ObjToString((*tmp)["city"]); city != "" && province != city {
 			rdata["city"] = city
 		}
-		if district := qu.ObjToString((*tmp)["district"]); district != "" && qu.ObjToString((*tmp)["city"])!= district{
+		if district := qu.ObjToString((*tmp)["district"]); district != "" && qu.ObjToString((*tmp)["city"]) != district {
 			rdata["district"] = district
 		}
 	} else if qu.ObjToString(data["district"]) == "" && qu.ObjToString((*tmp)["city"]) != "" && qu.ObjToString((*tmp)["city"]) == qu.ObjToString(data["city"]) {
-		if district := qu.ObjToString((*tmp)["district"]); district != "" &&qu.ObjToString(data["city"]) != district {
+		if district := qu.ObjToString((*tmp)["district"]); district != "" && qu.ObjToString(data["city"]) != district {
 			if qu.ObjToString(data["district"]) != rdata["city"] {
 				rdata["district"] = district
 			}