Merge branch 'dev3.4' of http://192.168.3.207:10080/qmx/jy-data-extract into dev3.4

src/jy/extract/newextractcity.go

@@ -77,12 +77,14 @@ func (e *ExtractTask) NewExtractCity(j *ju.Job, resulttmp map[string]interface{}
 	projectname, _ := resulttmp["projectname"].(string)
 	buyer, _ := resulttmp["buyer"].(string)
 	projectaddr, _ := resulttmp["projectaddr"].(string)
+	bidopenaddress, _ := resulttmp["bidopenaddress"].(string)
 	//qu.Debug("buyeraddr--", buyeraddr, "--buyer--", buyer, "--title--", title, "--projectname--", projectname)
 	sm.AddKey("buyeraddr", buyeraddr)
 	sm.AddKey("buyer", buyer)
 	sm.AddKey("title", title)
 	sm.AddKey("projectname", projectname)
 	sm.AddKey("projectaddr",projectaddr)
+	sm.AddKey("bidopenaddress",bidopenaddress)
 	//7.buyeraddr buyer title projectname抽取
 	e.NewGetCityByOthers(j, sm, &pscore, &cscore, &dscore)
 	//qu.Debug("全称打分后结果---", j.FullAreaScore, j.FullCityScore, j.FullDistrictScore)

udp_city/src/main.go

@@ -120,7 +120,7 @@ func getCity(sid, eid, rep string) {
 						umap["modifyinfo"].(map[string]interface{})[rk] = "企业信息"
 					}
 					unum++
-					log.Println(unum, ",id：", _id)
+					log.Println(unum, ",id：", _id, umap)
 					mgo.Mgo_Bidding.UpdateById(table, v["_id"], map[string]interface{}{
 						"$set": umap,
 					})
@@ -150,29 +150,57 @@ func cityMarshal(data map[string]interface{}) map[string]string {
 	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 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"]) {
-				rdata["district"] = district
+			if 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"]) {
+					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"]) {
+				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"]) {
+					rdata["district"] = district
+				}
+			} else if qu.ObjToString(data["district"]) == "" && qu.ObjToString((*province_city_district)["city"]) != "" && qu.ObjToString((*province_city_district)["city"]) == qu.ObjToString(data["city"]) {
+				if district := qu.ObjToString((*province_city_district)["district"]); district != "" && !strings.Contains(district, rdata["area"]) {
+					rdata["district"] = district
+				}
 			}
 			return rdata
 		}
 	}
-	if province := qu.ObjToString((*tmp)["province"]); province != "" {
-		province = strings.TrimRight(province, "省")
-		province = strings.TrimRight(province, "市")
-		rdata["area"] = province
-	}
-	if city := qu.ObjToString((*tmp)["city"]); city != "" {
-		rdata["city"] = city
-	}
-	if district := qu.ObjToString((*tmp)["district"]); district != "" {
-		rdata["district"] = district
+	var province string
+	if qu.ObjToString(data["area"]) == "" {
+		if province = qu.ObjToString((*tmp)["province"]); province != "" {
+			province = strings.TrimRight(province, "省")
+			province = strings.TrimRight(province, "市")
+			rdata["area"] = province
+		}
+		if city := qu.ObjToString((*tmp)["city"]); city != "" {
+			rdata["city"] = city
+		}
+		if district := qu.ObjToString((*tmp)["district"]); district != "" {
+			rdata["district"] = district
+		}
+	} else if qu.ObjToString(data["city"]) == "" && province != "" && qu.ObjToString(data["area"]) == province {
+		if city := qu.ObjToString((*tmp)["city"]); city != "" {
+			rdata["city"] = city
+		}
+		if district := qu.ObjToString((*tmp)["district"]); 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 != "" {
+			rdata["district"] = district
+		}
 	}
+
 	return rdata
 }
 func main() {