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

fullproject/src_v1/project.go

@@ -848,8 +848,6 @@ func (p *ProjectTask) UpdateProject(tmp map[string]interface{}, thisinfo *Info,
 		pkg := PackageFormat(thisinfo, pInfo)
 		pInfo.Package = pkg
 		set["package"] = pInfo.Package
-	} else {
-		set["multipackage"] = 0
 	}
 	//处理多包后，计算预算金额、中标金额
 	CountAmount(pInfo, thisinfo, tmp)

src/jy/extract/extpackage.go

@@ -130,6 +130,8 @@ func PackageDetail(j *ju.Job, e *ExtractTask, isSite bool, codeSite string) {
 					sonJobResult["origin"] = pkg.Origin
 					sonJobResult["text"] = pkg.Text
 					sonJobResult["name"] = pkg.Name
+					sonJobResult["winnertel"] = pkg.WinnerTel
+					sonJobResult["winnerperson"] = pkg.WinnerPerson
 					if pkg.IsTrueBudget{
 						sonJobResult["budget"] = pkg.Budget
 					}

src/jy/extract/extract.go

@@ -1004,6 +1004,16 @@ func ExtRuleCoreByPkgReg(j *ju.Job, in *RegLuaInfo, e *ExtractTask) {
 									j.BlockPackage[k].Winner = rep[in.Field+"_"+fmt.Sprint(i)]
 									break
 								}
+							} else if in.Field == "winnertel" {
+								if j.BlockPackage[k].WinnerTel == "" {
+									j.BlockPackage[k].WinnerTel = rep[in.Field+"_"+fmt.Sprint(i)]
+									break
+								}
+							} else if in.Field == "winnerperson" {
+								if j.BlockPackage[k].WinnerPerson == "" {
+									j.BlockPackage[k].WinnerPerson = rep[in.Field+"_"+fmt.Sprint(i)]
+									break
+								}
 							} else if in.Field == "bidstatus" {
 								if j.BlockPackage[k].BidStatus == "" {
 									j.BlockPackage[k].BidStatus = rep[in.Field+"_"+fmt.Sprint(i)]

src/jy/pretreated/colonkv.go

@@ -571,7 +571,7 @@ func FormatContactKv(kvs *[]*Kv, title string, buyers []string, contactFormat *C
 		//qutil.Debug("ContactInfoMustReg.MatchString(k)+++", !ContactInfoMustReg.MatchString(k))
 		matchMust := ContactInfoMustReg.MatchString(k)
 		matchHas := ContactInfoVagueReg.MatchString(k)
-		qutil.Debug("matchMust:", matchMust, "matchHas:", matchHas)
+		//qutil.Debug("matchMust:", matchMust, "matchHas:", matchHas)
 		if !matchMust && matchHas {
 			k = ContactInfoVagueReg.FindString(k)
 		}

src/jy/util/article.go

@@ -134,6 +134,8 @@ type BlockPackage struct {
 	Budget          float64                  //标段（包）预算
 	IsTrueBudget    bool                     //标段（包）预算0是否有效
 	Winner          string                   //标段（包）中标单位
+	WinnerTel		string					 //中标单位联系电话
+	WinnerPerson	string					 //中标联系人
 	Bidamount       float64                  //标段（包）中标价
 	IsTrueBidamount bool                     //标段（包）中标价 0是否有效
 	Index           string                   //序号 (转换后编号，只有数字或字母)

udp_winner/main.go

@@ -43,6 +43,7 @@ var (
 初始化
 */
 func init() {
+
 	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
 	util.ReadConfig(&Config)
 	util.ReadConfig(&Sysconfig)
@@ -84,9 +85,9 @@ func main() {
 	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
 	udpclient.Listen(processUdpMsg)
 	log.Println("Udp服务监听", updport)
-	go TimedTaskWinner() //定时任务
+	//go TimedTaskWinner() //定时任务
 	go TimedTaskBuyer()  //定时任务
-	go TimedTaskAgency() //定时任务
+	//go TimedTaskAgency() //定时任务
 	go checkMapJob()
 	c := make(chan int, 1)
 	<-c

udp_winner/timedTaskAgency.go

@@ -177,7 +177,7 @@ func TaskAgency(mapinfo *map[string]interface{}) {
 					//遍历redis value联系人
 					for _, rvmap := range rValuesMaps {
 						var tmpperson, agencytel string
-						if rvmapperson, ok := rvmap["agencyperson"].(string); ok && rvmapperson != "" {
+						if rvmapperson, ok := rvmap["agencyperson"].(string); ok && utf8.RuneCountInString(rvmapperson)>=2 && rvmapperson != "" {
 							tmpperson = rvmapperson
 						} else {
 							continue
@@ -308,7 +308,7 @@ func AddAgency(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, agencytel string
-		if tmppersona, ok := tmp["agencyperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
+		if tmppersona, ok := tmp["agencyperson"].(string); ok && utf8.RuneCountInString(tmppersona)>=2 && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {
@@ -478,7 +478,7 @@ func TimedTaskAgency() {
 							}
 						}
 						contacts := make([]map[string]interface{}, 0)
-						if legal_person, ok := resulttmp["legal_person"].(string); ok && legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
+						if legal_person, ok := resulttmp["legal_person"].(string); ok && utf8.RuneCountInString(legal_person)>=2 && legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
 							contact := make(map[string]interface{}, 0)
 							contact["contact_person"] = legal_person //联系人
 							contact["contact_type"] = "法定代表人"        //法定代表人
@@ -523,7 +523,7 @@ func TimedTaskAgency() {
 
 
 						//添加临时表匹配到的联系人
-						if agencyperson, ok := tmp["agencyperson"].(string); ok && agencyperson != "" &&
+						if agencyperson, ok := tmp["agencyperson"].(string); ok && utf8.RuneCountInString(agencyperson)>=2 && agencyperson != "" &&
 							!Reg_xing.MatchString(agencyperson) && Reg_person.MatchString(agencyperson) {
 							vvv := make(map[string]interface{})
 							vvv["infoid"] = tmp["_id"].(bson.ObjectId).Hex()

udp_winner/timedTaskBuyer.go

@@ -196,7 +196,7 @@ func TaskBuyer(mapinfo *map[string]interface{}) {
 					//遍历redis value联系人
 					for _, rvmap := range rValuesMaps {
 						var tmpperson, buyertel string
-						if rvmapperson, ok := rvmap["buyerperson"].(string); ok && rvmapperson != "" {
+						if rvmapperson, ok := rvmap["buyerperson"].(string); ok && utf8.RuneCountInString(rvmapperson)>=2 && rvmapperson != "" {
 							tmpperson = rvmapperson
 						} else {
 							continue
@@ -345,7 +345,7 @@ func AddBuyer(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, buyertel string
-		if tmppersona, ok := tmp["buyerperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
+		if tmppersona, ok := tmp["buyerperson"].(string); ok && utf8.RuneCountInString(tmppersona)>=2 && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {
@@ -515,7 +515,7 @@ func TimedTaskBuyer() {
 							}
 						}
 						contacts := make([]map[string]interface{}, 0)
-						if legal_person, ok := resulttmp["legal_person"].(string); ok && legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
+						if legal_person, ok := resulttmp["legal_person"].(string); ok && utf8.RuneCountInString(legal_person)>=2 &&legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
 							contact := make(map[string]interface{}, 0)
 							contact["contact_person"] = legal_person //联系人
 							contact["contact_type"] = "法定代表人"        //法定代表人
@@ -560,7 +560,7 @@ func TimedTaskBuyer() {
 
 
 						//添加临时表匹配到的联系人
-						if buyerperson, ok := tmp["buyerperson"].(string); ok && buyerperson != "" &&
+						if buyerperson, ok := tmp["buyerperson"].(string); ok &&utf8.RuneCountInString(buyerperson)>=2 && buyerperson != "" &&
 							!Reg_xing.MatchString(buyerperson) && Reg_person.MatchString(buyerperson) {
 							vvv := make(map[string]interface{})
 							vvv["infoid"] = tmp["_id"].(bson.ObjectId).Hex()

udp_winner/timedTaskWinner.go

@@ -229,7 +229,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 					//遍历redis value联系人
 					for _, rvmap := range rValuesMaps {
 						var tmpperson, winnertel string
-						if rvmapperson, ok := rvmap["winnerperson"].(string); ok && rvmapperson != "" {
+						if rvmapperson, ok := rvmap["winnerperson"].(string); ok && utf8.RuneCountInString(rvmapperson)>=2 && rvmapperson != "" {
 							tmpperson = rvmapperson
 						} else {
 							continue
@@ -370,7 +370,7 @@ func Add(overid string, tmp map[string]interface{}) string {
 			}
 		}
 		var tmpperson, winnertel string
-		if tmppersona, ok := tmp["winnerperson"].(string); ok && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
+		if tmppersona, ok := tmp["winnerperson"].(string); ok && utf8.RuneCountInString(tmppersona)>=2 && tmppersona != "" && Reg_person.MatchString(tmppersona) && !Reg_xing.MatchString(tmppersona) {
 			tmpperson = tmppersona
 		}
 		if tmpperson != "" {
@@ -539,7 +539,7 @@ func TimedTaskWinner() {
 							}
 						}
 						contacts := make([]map[string]interface{}, 0)
-						if legal_person, ok := resulttmp["legal_person"].(string); ok && legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
+						if legal_person, ok := resulttmp["legal_person"].(string); ok && utf8.RuneCountInString(legal_person)>=2 && legal_person != "" && !Reg_xing.MatchString(legal_person) && Reg_person.MatchString(legal_person) {
 							contact := make(map[string]interface{}, 0)
 							contact["contact_person"] = legal_person //联系人
 							contact["contact_type"] = "法定代表人"        //法定代表人
@@ -582,7 +582,7 @@ func TimedTaskWinner() {
 							contacts = append(contacts, contact)
 						}
 						//添加临时表匹配到的联系人
-						if winnerperson, ok := tmp["winnerperson"].(string); ok && winnerperson != "" &&
+						if winnerperson, ok := tmp["winnerperson"].(string); ok && utf8.RuneCountInString(winnerperson)>=2 && winnerperson != "" &&
 							!Reg_xing.MatchString(winnerperson) && Reg_person.MatchString(winnerperson) {
 							vvv := make(map[string]interface{})
 							vvv["infoid"] = tmp["_id"].(bson.ObjectId).Hex()