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

src/config.json

@@ -32,7 +32,7 @@
     "iscltlog": false,
     "brandgoods": false,
     "pricenumber":true,
-    "udptaskid": "6061980a5743176a571695a1",
+    "udptaskid": "607fb74f049a9923d8a4efd9",
     "udpport": "1484",
     "nextNode": [
         {

src/jy/extract/extract.go

@@ -50,6 +50,33 @@ var (
 		"title":            true,
 		"projectname":      true,
 	}*/
+	/*f       = map[string]bool{
+		"contentid":        true,
+		"progName":               true,
+		"updateTime":             true,
+		"url":          true,
+		"areaId":       true,
+		"areaName":      true,
+		"popTitle":             true,
+		"showTitle": true,
+		"progId":      true,
+		"catid":         true,
+		"isConcern":             true,
+		"followCount":       true,
+		"followSuggestion":            true,
+		"isBoutique":            true,
+		"canTj":            true,
+		"tenderAmountNumber":            true,
+		"tenderAmountUnit":            true,
+		"bidderAmountNumber":            true,
+		"bidderAmountUnit":            true,
+		"registrationBeginTime":            true,
+		"registrationEndTime":            true,
+		"starNum":            true,
+		"title":            true,
+		"proInvested":            true,
+		"projectname":      true,
+	}*/
 	spidercode = map[string]bool{
 		"gd_zhsggzyjyzx_jsgc_fjczbgg":     true,
 		"js_szgyyqggzyjyzx_jsgc_zjfbgs":   true,
@@ -1858,6 +1885,7 @@ func AnalysisSaveResult(j, jf *ju.Job, e *ExtractTask) {
 		//重新取出清理过后的中标候选人
 		resetWinnerorder(j)
 		doc, result, _id := funcAnalysis(j, e)
+		//_, result, _id := funcAnalysis(j, e)
 		if ju.IsSaveTag {
 			go otherNeedSave(j, result, e)
 		}
@@ -2264,19 +2292,19 @@ func checkFields(tmp map[string]interface{}) map[string]interface{} {
 		if bg >= 50000000000 {
 			tmp["budget_max_err"] = bg
 			delete(tmp, "budget")
-		} else if bg > 0 && bg < 1000 {
+		} /*else if bg > 0 && bg < 1000 {
 			tmp["budget_min_err"] = bg
 			delete(tmp, "budget")
-		}
+		}*/
 	}
 	if bg, ok := tmp["bidamount"].(float64); ok && bg >= 50000000000 {
 		if bg >= 50000000000 {
 			tmp["bidamount_max_err"] = bg
 			delete(tmp, "bidamount")
-		} else if bg > 0 && bg < 1000 {
+		} /*else if bg > 0 && bg < 1000 {
 			tmp["bidamount_min_err"] = bg
 			delete(tmp, "bidamount")
-		}
+		}*/
 	}
 	return tmp
 }

src/jy/extract/extractInit.go

@@ -1211,18 +1211,18 @@ func (e *ExtractTask) initDistricts(jc_province string, qc_city string, c *City,
 				e.NewStreetDistrictMap[strvtown] = append(e.NewStreetDistrictMap[strvtown], d)
 			}
 			//村、居委会
-			// jwhs := jwhs_maps[jc_province][qc_city][qc_district][strvtown]
-			// for _, vjwh := range jwhs {
-			// 	strvillage := qu.ObjToString(vjwh["village"])
-			// 	e.Trie_Full_Community.AddWords(strvillage) //加入居委会、村全称Trie
-			// 	cttmp := e.CommunityDistrictMap[strvillage]
-			// 	if len(cttmp) == 0 {
-			// 		tmpdarr := []*District{d}
-			// 		e.CommunityDistrictMap[strvillage] = tmpdarr
-			// 	} else {
-			// 		e.CommunityDistrictMap[strvillage] = append(e.CommunityDistrictMap[strvillage], d)
-			// 	}
-			// }
+			//jwhs := jwhs_maps[jc_province][qc_city][qc_district][strvtown]
+			//for _, vjwh := range jwhs {
+			//	strvillage := qu.ObjToString(vjwh["village"])
+			//	e.Trie_Full_Community.AddWords(strvillage) //加入居委会、村全称Trie
+			//	cttmp := e.CommunityDistrictMap[strvillage]
+			//	if len(cttmp) == 0 {
+			//		tmpdarr := []*District{d}
+			//		e.CommunityDistrictMap[strvillage] = tmpdarr
+			//	} else {
+			//		e.CommunityDistrictMap[strvillage] = append(e.CommunityDistrictMap[strvillage], d)
+			//	}
+			//}
 		}
 
 	}