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

src/config.json

@@ -5,13 +5,13 @@
     "dbname": "extract_kf",
     "redis": "buyer=127.0.0.1:6379,winner=127.0.0.1:6379,agency=127.0.0.1:6379,qyk_redis=127.0.0.1:6379",
     "elasticsearch": "http://127.0.0.1:9800",
-    "elasticsearch_index": "winner_enterprise",
+    "elasticsearch_index": "winner_enterprise_tmp",
     "elasticsearch_type": "winnerent",
     "elasticsearch_db": "winner_enterprise",
-    "elasticsearch_buyer_index": "buyer_enterprise",
+    "elasticsearch_buyer_index": "buyer_enterprise_tmp",
     "elasticsearch_buyer_type": "buyerent",
     "elasticsearch_buyer_db": "buyer_enterprise",
-    "elasticsearch_agency_index": "agency_enterprise",
+    "elasticsearch_agency_index": "agency_enterprise_tmp",
     "elasticsearch_agency_type": "agencyent",
     "elasticsearch_agency_db": "agency_enterprise",
     "redis_qyk": "qyk_redis",

src/jy/admin/audit/dataaudit.go

@@ -163,7 +163,6 @@ func AllAudit(c *gin.Context) {
 				}
 			}
 			//删除标记数据
-			coll, _ := c.GetPostForm("coll")
 			query := map[string]interface{}{
 				"_id": qu.StringTOBsonId(idsArr[i]),
 			}
@@ -172,6 +171,7 @@ func AllAudit(c *gin.Context) {
 				log.Println("Del Audit Data Error 	coll:", coll, "	field:", field, "	id:", idsArr[i])
 			}
 		}
+		c.JSON(200, gin.H{"rep": true, "msg": "审核通过"})
 	}
 }
 func DataSave(c *gin.Context) {

src/web/templates/admin/agencyinfo.html

@@ -11,6 +11,10 @@
     .operate a {
         padding: 5px 10px;
     }
+    #infos{
+        height: 666px;
+        overflow-y: scroll;
+    }
 </style>
 <div class="content-wrapper">
     <section class="content-header" style="padding: 49px 15px 0 15px;">

src/web/templates/admin/audit_auditone.html

@@ -4,6 +4,13 @@
 <!-- Left side column. 权限菜单 -->
 {{template "memu"}}
 
+<style>
+	#infos{
+		height: 666px;
+		overflow-y: scroll;
+	}
+</style>
+
 <div class="content-wrapper">
 	<section class="content-header">
 		<h1>
@@ -192,11 +199,8 @@ function allDel(coll,_id,type){
 }
 
 function audit(text,_id){//单条信息审核
-  showConfirm("确定审核通过？", function() {
-    id = _id;
-  	AddQYKHTML(text)
-  })
-	
+  id = _id;
+	AddQYKHTML(text)
 }
 //审核确认
 function auditsave(parentclass,childclass){
@@ -278,7 +282,7 @@ function AddQYKHTML(text) {
   "<div class=\"col-sm-9\" id='contact' style=\"height:250px\"></div>" +
   "<div class=\"row form-group\">" +
   "<button type='button' class='btn btn-sm btn-default col-md-offset-5 col-md-2'  data-dismiss='modal' aria-label='Close'>取消</button>" +
-  "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='Add()'>新增企业库</button></div>";
+  "<button type='button' class='btn btn-sm btn-danger col-md-2' onclick='Add()'>新增企业</button></div>";
   
   var com = "";
 	{{if eq .name "winner"}}
@@ -348,11 +352,10 @@ function Add() {
 	obj["coll"] = {{.coll}};
 	obj["_id"] = id;
   obj["field"] = {{.name}};
-	console.log(obj)
 	$.post("/admin/audit/datasave",obj,function(data){
 		if(data&&data.rep){
-			alert("成功")
-			//window.location.href="/admin/task"								
+       $("#info_data").modal("hide");
+      ttable.ajax.reload();
 		}else{
 			showTip(data.msg,1000)
 		}

src/web/templates/admin/buyerinfo.html

@@ -11,6 +11,10 @@
     .operate a {
         padding: 5px 10px;
     }
+    #infos{
+        height: 666px;
+        overflow-y: scroll;
+    }
 </style>
 <div class="content-wrapper">
     <section class="content-header" style="padding: 49px 15px 0 15px;">

src/web/templates/admin/qiyekuinfo.html

@@ -11,6 +11,10 @@
     .operate a {
         padding: 5px 10px;
     }
+    #infos{
+        height: 666px;
+        overflow-y: scroll;
+    }
 </style>
 <div class="content-wrapper">
     <section class="content-header" style="padding: 49px 15px 0 15px;">

udp_winner/main.go

@@ -67,43 +67,67 @@ func init() {
 	AgencyFields = []string{"_id", "contact", "type", "ranks",
 		"address", "district", "city", "province", "area_code", "credit_no", "agency_name",
 		"history_name", "wechat_accounts", "website", "report_websites"}
-	pool_size, _ := strconv.Atoi(Config["pool_size"])
-
-	//mongo init
-	SourceClient = new(mongodb.MongodbSim)
-	SourceClient.MongodbAddr = Config["mgoinit"]
-	SourceClient.Size = pool_size
-	SourceClient.DbName = Config["mgodb_bidding"]
-	//mongodbSim.DbName = "qfw"
-	SourceClient.InitPool()
 
-	FClient = new(mongodb.MongodbSim)
-	FClient.MongodbAddr = Config["mgourl"]
-	FClient.Size = pool_size
-	FClient.DbName = Config["mgodb_extract_kf"]
-	//mongodbSim.DbName = "qfw"
-	FClient.InitPool()
-	FClientmgoConn := FClient.GetMgoConn()
-	defer FClient.DestoryMongoConn(FClientmgoConn)
-	//加载省市县代码
-	cursor2 := FClientmgoConn.DB(Config["mgodb_extract_kf"]).C("address").Find(bson.M{}).Select(bson.M{"province": 1, "code": 1, "city": 1, "district": 1}).Iter()
-	//defer FClient.Connect(cc)
-	if cursor2 == nil {
-		log.Fatalln(cursor2)
-	}
-	tmp := make(map[string]interface{})
-	for cursor2.Next(&tmp) {
-		code := tmp["code"]
-		if code != nil && strings.TrimSpace(code.(string)) != "" {
-			Addrs[fmt.Sprint(code)] = tmp
-		}
-	}
-	log.Println(len(Addrs))
 	//es.NewClient(es.SetURL(addrs...), es.SetMaxRetries(2), es.SetSniff(false))
 	//es init
 	elastic.InitElasticSize(Config["elasticsearch"], 50)
 	EsConn = elastic.GetEsConn()
 	defer elastic.DestoryEsConn(EsConn)
+	initRdis()
+	initMongo()
+	initReg()
+}
+
+func main() {
+	//udp
+	updport := Config["udpport"]
+	Updport, _ = strconv.Atoi(Config["port"])
+	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
+	udpclient.Listen(processUdpMsg)
+	log.Println("Udp服务监听", updport)
+	log.Println("发送端口port：", Updport)
+	go TimedTaskWinner() //定时任务
+	go TimedTaskBuyer()  //定时任务
+	go TimedTaskAgency() //定时任务
+	c := make(chan int, 1)
+	<-c
+
+}
+
+func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
+	log.Println(act, string(data), ra)
+	switch act {
+	case mu.OP_TYPE_DATA: //上个节点的数据
+		//从表中开始处理生成企业数据
+		tmp := new(map[string]interface{})
+		err := json.Unmarshal(data, &tmp)
+		if err != nil {
+			log.Println("err:", err)
+			udpclient.WriteUdp([]byte("err:"+err.Error()), mu.OP_NOOP, ra)
+			return
+		} else if tmp != nil {
+			if key, ok := (*tmp)["key"].(string); ok {
+				udpclient.WriteUdp([]byte(key), mu.OP_NOOP, ra)
+			} else {
+				udpclient.WriteUdp([]byte("udpok"), mu.OP_NOOP, ra)
+			}
+			//data_info:save//存量   data_info:add //增量
+			//阻塞
+			CPool <- true
+			go func(mapinfo *map[string]interface{}) {
+				defer func() { <-CPool }()
+				go TaskWinner(mapinfo)
+				go TaskBuyer(mapinfo)
+				go TaskAgency(mapinfo)
+			}(tmp)
+		}
+	case mu.OP_NOOP: //下个节点回应
+		log.Println("发送成功", string(data))
+	}
+}
+
+func initRdis() {
+	var err error
 	//redis
 	RedisPool = redis.Pool{
 		MaxIdle:     50,
@@ -137,11 +161,43 @@ func init() {
 	redis_winner_db, _ = strconv.Atoi(Config["redis_winner_db"])
 	redis_buyer_db, _ = strconv.Atoi(Config["redis_buyer_db"])
 	redis_agency_db, _ = strconv.Atoi(Config["redis_agency_db"])
-	iniReg()
+}
+
+func initMongo() {
+	//mongo init
+	pool_size, _ := strconv.Atoi(Config["pool_size"])
+	SourceClient = new(mongodb.MongodbSim)
+	SourceClient.MongodbAddr = Config["mgoinit"]
+	SourceClient.Size = pool_size
+	SourceClient.DbName = Config["mgodb_bidding"]
+	//mongodbSim.DbName = "qfw"
+	SourceClient.InitPool()
 
+	FClient = new(mongodb.MongodbSim)
+	FClient.MongodbAddr = Config["mgourl"]
+	FClient.Size = pool_size
+	FClient.DbName = Config["mgodb_extract_kf"]
+	//mongodbSim.DbName = "qfw"
+	FClient.InitPool()
+	FClientmgoConn := FClient.GetMgoConn()
+	defer FClient.DestoryMongoConn(FClientmgoConn)
+	//加载省市县代码
+	cursor2 := FClientmgoConn.DB(Config["mgodb_extract_kf"]).C("address").Find(bson.M{}).Select(bson.M{"province": 1, "code": 1, "city": 1, "district": 1}).Iter()
+	//defer FClient.Connect(cc)
+	if cursor2 == nil {
+		log.Fatalln(cursor2)
+	}
+	tmp := make(map[string]interface{})
+	for cursor2.Next(&tmp) {
+		code := tmp["code"]
+		if code != nil && strings.TrimSpace(code.(string)) != "" {
+			Addrs[fmt.Sprint(code)] = tmp
+		}
+	}
+	log.Println(len(Addrs))
 }
 
-func iniReg() {
+func initReg() {
 	FClientmgoConnReg := FClient.GetMgoConn()
 	defer FClient.DestoryMongoConn(FClientmgoConnReg)
 	findReg, b := FClient.Find(Config["mgo_qyk_reg"], bson.M{"delete": false, "isuse": true}, bson.M{"_id": 1}, nil, false, -1, 0)
@@ -157,76 +213,24 @@ func iniReg() {
 		}
 		regtmp := regexp.MustCompile(s_rule)
 		if s_field == "winner" {
-			if s_type=="ok"{
+			if s_type == "ok" {
 				WinnerRegOk = append(WinnerRegOk, *regtmp)
-			}else if s_type=="err"{
+			} else if s_type == "err" {
 				WinnerRegErr = append(WinnerRegErr, *regtmp)
 			}
 		} else if s_field == "buyer" {
-			if s_type=="ok"{
+			if s_type == "ok" {
 				BuerRegOk = append(BuerRegOk, *regtmp)
-			}else if s_type=="err"{
+			} else if s_type == "err" {
 				BuyerRegErr = append(BuyerRegErr, *regtmp)
 			}
 		} else if s_field == "agency" {
-			if s_type=="ok"{
+			if s_type == "ok" {
 				AgencyRegOk = append(AgencyRegOk, *regtmp)
-			}else if s_type=="err"{
+			} else if s_type == "err" {
 				AgencyRegErr = append(AgencyRegErr, *regtmp)
 			}
 		}
 	}
 	log.Println(len(WinnerRegOk), len(WinnerRegErr), len(BuerRegOk), len(BuyerRegErr), len(AgencyRegOk), len(AgencyRegErr))
 }
-
-func main() {
-	//udp
-	updport := Config["udpport"]
-	Updport, _ = strconv.Atoi(Config["port"])
-	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
-	udpclient.Listen(processUdpMsg)
-	log.Println("Udp服务监听", updport)
-	log.Println("发送端口port：", Updport)
-	go TimedTaskWinner() //定时任务
-	go TimedTaskBuyer()  //定时任务
-	go TimedTaskAgency() //定时任务
-	c := make(chan int, 1)
-	<-c
-
-}
-
-func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
-	log.Println(act, string(data), ra)
-	switch act {
-	case mu.OP_TYPE_DATA: //上个节点的数据
-		//从表中开始处理生成企业数据
-		tmp := new(map[string]interface{})
-		err := json.Unmarshal(data, &tmp)
-		if err != nil {
-			log.Println("err:", err)
-			udpclient.WriteUdp([]byte("err:"+err.Error()), mu.OP_NOOP, ra)
-			return
-		} else if tmp != nil {
-			if key, ok := (*tmp)["key"].(string); ok {
-				udpclient.WriteUdp([]byte(key), mu.OP_NOOP, ra)
-			} else {
-				udpclient.WriteUdp([]byte("udpok"), mu.OP_NOOP, ra)
-			}
-			//data_type:winner data_type:buyer data_type:agency
-			//data_info:save//存量   data_info:add //增量
-			if key, ok := (*tmp)["data_type"].(string); ok {
-				//阻塞
-				CPool <- true
-				if key == "winner" {
-					go TaskWinner(tmp)
-				} else if key == "buyer" {
-					go TaskBuyer(tmp)
-				} else if key == "agency" {
-					go TaskAgency(tmp)
-				}
-			}
-		}
-	case mu.OP_NOOP: //下个节点回应
-		log.Println("发送成功", string(data))
-	}
-}

udp_winner/timedTaskAgency.go

@@ -18,8 +18,6 @@ import (
 //之前main方法,只更新
 func TaskAgency(mapinfo *map[string]interface{}) {
 	defer util.Catch()
-	//释放
-	defer func() { <-CPool }()
 	gtid, lteid := util.ObjToString((*mapinfo)["gtid"]), util.ObjToString((*mapinfo)["lteid"])
 	if gtid == "" || lteid == "" {
 		log.Println(gtid, lteid, "参数错误")

udp_winner/timedTaskBuyer.go

@@ -18,8 +18,6 @@ import (
 //之前main方法,只更新
 func TaskBuyer(mapinfo *map[string]interface{}) {
 	defer util.Catch()
-	//释放
-	defer func() { <-CPool }()
 	gtid, lteid := util.ObjToString((*mapinfo)["gtid"]), util.ObjToString((*mapinfo)["lteid"])
 	if gtid == "" || lteid == "" {
 		log.Println(gtid, lteid, "参数错误")

udp_winner/timedTaskWinner.go

@@ -4,10 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/garyburd/redigo/redis"
+	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 	"log"
-	mu "mfw/util"
-	"net"
 	"qfw/util"
 	"sort"
 	"strings"
@@ -18,8 +17,6 @@ import (
 //之前main方法,只更新
 func TaskWinner(mapinfo *map[string]interface{}) {
 	defer util.Catch()
-	//释放
-	defer func() { <-CPool }()
 	gtid, lteid := util.ObjToString((*mapinfo)["gtid"]), util.ObjToString((*mapinfo)["lteid"])
 	if gtid == "" || lteid == "" {
 		log.Println(gtid, lteid, "参数错误")
@@ -43,7 +40,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 			"$gte": GId,
 			"$lte": LtId,
 		},
-	}).Select(bson.M{"winner": 1, "winnertel": 1, "winnerperson": 1, "topscopeclass": 1, "winneraddr": 1}).Iter()
+	}).Select(bson.M{"winner": 1, "winnertel": 1, "winnerperson": 1, "topscopeclass": 1, "package": 1}).Iter()
 
 	if cursor.Err() != nil {
 		SourceClient.DestoryMongoConn(SourceClientcc)
@@ -125,7 +122,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 					//拿到合并后的qyk
 					FClient.DbName = Config["mgodb_extract_kf"]
 					oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, nil)
-					if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
+					if !b || (*oldTmp) == nil || reply == "" || (*oldTmp)["_id"] == nil {
 						log.Println(redisCName, "存量 redis id 不存在", reply)
 						continue
 					}
@@ -215,133 +212,141 @@ func TaskWinner(mapinfo *map[string]interface{}) {
 		log.Println("存量历史合并执行完成 ok", gtid, lteid)
 
 	} else {
-		//增量处理
-		overid := gtid
-		tmp := map[string]interface{}{}
-		for cursor.Next(&tmp) {
-			overid = tmp["_id"].(bson.ObjectId).Hex()
-			//log.Println(tmp["_id"])
-			winner, ok := tmp["winner"].(string)
-			if !ok || utf8.RuneCountInString(winner) < 4 {
-				continue
+		//增量
+		overid := addfunc(gtid, cursor)
+		SourceClient.DestoryMongoConn(SourceClientcc)
+		log.Println("增量合并执行完成 ok", gtid, lteid, overid)
+	}
+
+}
+
+//增量
+func addfunc(gtid string, cursor *mgo.Iter) string {
+	//增量处理
+	overid := gtid
+	tmp := map[string]interface{}{}
+	for cursor.Next(&tmp) {
+		overid = tmp["_id"].(bson.ObjectId).Hex()
+		//log.Println(tmp["_id"])
+		winner, ok := tmp["winner"].(string)
+		if !ok || utf8.RuneCountInString(winner) < 4 {
+			continue
+		}
+		//redis查询是否存在
+		rdb := RedisPool.Get()
+		rdb.Do("SELECT", redis_winner_db)
+		if reply, err := redis.String(rdb.Do("GET", winner)); err != nil {
+			//redis不存在存到临时表,定时任务处理
+			FClient.DbName = Config["mgodb_extract_kf"]
+			if err := FClient.SaveForOld("winner_new", tmp); err != nil {
+				log.Println("FClient.Save err", err, tmp)
 			}
-			//redis查询是否存在
-			rdb := RedisPool.Get()
-			rdb.Do("SELECT", redis_winner_db)
-			if reply, err := redis.String(rdb.Do("GET", winner)); err != nil {
-				//redis不存在存到临时表,定时任务处理
-				FClient.DbName = Config["mgodb_extract_kf"]
-				if err := FClient.SaveForOld("winner_new", tmp); err != nil {
-					log.Println("FClient.Save err", err, tmp)
-				}
-				//log.Println("get redis id err:定时任务处理", err, tmp)
-				if err := rdb.Close(); err != nil {
-					log.Println(err)
-				}
+			//log.Println("get redis id err:定时任务处理", err, tmp)
+			if err := rdb.Close(); err != nil {
+				log.Println(err)
+			}
+			continue
+		} else {
+			if err := rdb.Close(); err != nil {
+				log.Println(err)
+			}
+			//拿到合并后的qyk
+			FClient.DbName = Config["mgodb_extract_kf"]
+			oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, bson.M{})
+			if !b || (*oldTmp) == nil || reply == "" || (*oldTmp)["_id"] == nil {
+				log.Println("redis id 不存在")
 				continue
-			} else {
-				if err := rdb.Close(); err != nil {
-					log.Println(err)
-				}
-				//拿到合并后的qyk
-				FClient.DbName = Config["mgodb_extract_kf"]
-				oldTmp, b := FClient.FindById(Config["mgo_qyk_c"], reply, bson.M{})
-				if !b || (*oldTmp) == nil|| reply==""||(*oldTmp)["_id"]==nil{
-					log.Println("redis id 不存在")
-					continue
-				}
-				//比较合并
-				//行业类型
-				tmpTopscopeclass := []string{}
-				tmpConTopscopeclass := []string{}
-				tmpTopscopeclassMap := make(map[string]bool)
+			}
+			//比较合并 行业类型
+			tmpTopscopeclass := []string{}
+			tmpConTopscopeclass := []string{}
+			tmpTopscopeclassMap := make(map[string]bool)
 
-				if (*oldTmp)["industry"] != nil {
-					if v, ok := (*oldTmp)["industry"].([]interface{}); ok {
-						for _, vv := range v {
-							if vvv, ok := vv.(string); ok {
-								tmpTopscopeclassMap[vvv] = true
-							}
-						}
-					}
-				}
-				if v, ok := tmp["topscopeclass"].([]interface{}); ok {
+			if (*oldTmp)["industry"] != nil {
+				if v, ok := (*oldTmp)["industry"].([]interface{}); ok {
 					for _, vv := range v {
-						if vvv, ok := vv.(string); ok && len(vvv) > 1 {
-							tmpTopscopeclassMap[vvv[:len(vvv)-1]] = true
-							tmpConTopscopeclass = append(tmpConTopscopeclass, vvv[:len(vvv)-1])
+						if vvv, ok := vv.(string); ok {
+							tmpTopscopeclassMap[vvv] = true
 						}
 					}
 				}
-				for k := range tmpTopscopeclassMap {
-					tmpTopscopeclass = append(tmpTopscopeclass, k)
-				}
-				sort.Strings(tmpTopscopeclass)
-				(*oldTmp)["industry"] = tmpTopscopeclass
-
-				esId := (*oldTmp)["_id"].(bson.ObjectId).Hex()
-				//更新行业类型
-				if tmp["winnerperson"] == nil || tmp["winnerperson"] == "" || Reg_xing.MatchString(util.ObjToString(tmp["winnerperson"])) {
-					(*oldTmp)["updatatime"] = time.Now().Unix()
-					//mongo更新
-					FClient.DbName = Config["mgodb_extract_kf"]
-					if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
-						log.Println("mongo更新err", esId)
-					}
-
-					//es更新
-					delete((*oldTmp), "_id")
-					if _, err := EsConn.Update().Index(Config["elasticsearch_index"]).Type(Config["elasticsearch_type"]).Id(esId).Doc(oldTmp).Refresh(true).Do(); err != nil {
-						log.Println("update es err:", err)
-					}
-					continue
-				}
-				//联系方式合并
-				var tmpperson, winnertel string
-				if tmppersona, ok := tmp["winnerperson"].(string); ok {
-					tmpperson = tmppersona
-				}
-				if winnerteltmp, ok := tmp["winnertel"].(string); ok {
-					winnertel = winnerteltmp
-				}
-				if Reg_xing.MatchString(winnertel) || !Reg_tel.MatchString(winnertel) {
-					winnertel = ""
-				} else {
-					winnertel = winnertel
-				}
-				contactMaps := make([]interface{}, 0)
-				if (*oldTmp)["contact"] != nil {
-					//直接添加联系人，不再判断
-					if v, ok := (*oldTmp)["contact"].([]interface{}); ok {
-						contactMaps = append(contactMaps, v...)
+			}
+			if v, ok := tmp["topscopeclass"].([]interface{}); ok {
+				for _, vv := range v {
+					if vvv, ok := vv.(string); ok && len(vvv) > 1 {
+						tmpTopscopeclassMap[vvv[:len(vvv)-1]] = true
+						tmpConTopscopeclass = append(tmpConTopscopeclass, vvv[:len(vvv)-1])
 					}
 				}
-				vvv := make(map[string]interface{})
-				vvv["infoid"] = overid
-				vvv["contact_person"] = tmpperson
-				vvv["contact_type"] = "项目联系人"
-				vvv["phone"] = winnertel
-				vvv["topscopeclass"] = strings.Join(tmpConTopscopeclass, ";")
-				vvv["updatetime"] = time.Now().Unix()
-				contactMaps = append(contactMaps, vvv)
-				(*oldTmp)["contact"] = contactMaps
-				//mongo更新
+			}
+			for k := range tmpTopscopeclassMap {
+				tmpTopscopeclass = append(tmpTopscopeclass, k)
+			}
+			sort.Strings(tmpTopscopeclass)
+			(*oldTmp)["industry"] = tmpTopscopeclass
+
+			esId := (*oldTmp)["_id"].(bson.ObjectId).Hex()
+			//更新行业类型
+			if tmp["winnerperson"] == nil || tmp["winnerperson"] == "" || Reg_xing.MatchString(util.ObjToString(tmp["winnerperson"])) {
 				(*oldTmp)["updatatime"] = time.Now().Unix()
+				//mongo更新
 				FClient.DbName = Config["mgodb_extract_kf"]
 				if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
-					log.Println("mongo更新 err", esId, oldTmp)
+					log.Println("mongo更新err", esId)
 				}
+
 				//es更新
 				delete((*oldTmp), "_id")
 				if _, err := EsConn.Update().Index(Config["elasticsearch_index"]).Type(Config["elasticsearch_type"]).Id(esId).Doc(oldTmp).Refresh(true).Do(); err != nil {
-					log.Println("EsConn err :", err)
+					log.Println("update es err:", err)
 				}
+				continue
+			}
+			//联系方式合并
+			var tmpperson, winnertel string
+			if tmppersona, ok := tmp["winnerperson"].(string); ok {
+				tmpperson = tmppersona
+			}
+			if winnerteltmp, ok := tmp["winnertel"].(string); ok {
+				winnertel = winnerteltmp
+			}
+			if Reg_xing.MatchString(winnertel) || !Reg_tel.MatchString(winnertel) {
+				winnertel = ""
+			} else {
+				winnertel = winnertel
+			}
+			contactMaps := make([]interface{}, 0)
+			if (*oldTmp)["contact"] != nil {
+				//直接添加联系人，不再判断
+				if v, ok := (*oldTmp)["contact"].([]interface{}); ok {
+					contactMaps = append(contactMaps, v...)
+				}
+			}
+			vvv := make(map[string]interface{})
+			vvv["infoid"] = overid
+			vvv["contact_person"] = tmpperson
+			vvv["contact_type"] = "项目联系人"
+			vvv["phone"] = winnertel
+			vvv["topscopeclass"] = strings.Join(tmpConTopscopeclass, ";")
+			vvv["updatetime"] = time.Now().Unix()
+			contactMaps = append(contactMaps, vvv)
+			//分包处理
+			PackageDealWith(&contactMaps, tmp)
+			(*oldTmp)["contact"] = contactMaps
+			//mongo更新
+			(*oldTmp)["updatatime"] = time.Now().Unix()
+			FClient.DbName = Config["mgodb_extract_kf"]
+			if !FClient.UpdateById(Config["mgo_qyk_c"], esId, bson.M{"$set": oldTmp}) {
+				log.Println("mongo更新 err", esId, oldTmp)
+			}
+			//es更新
+			delete((*oldTmp), "_id")
+			if _, err := EsConn.Update().Index(Config["elasticsearch_index"]).Type(Config["elasticsearch_type"]).Id(esId).Doc(oldTmp).Refresh(true).Do(); err != nil {
+				log.Println("EsConn err :", err)
 			}
 		}
-		SourceClient.DestoryMongoConn(SourceClientcc)
-		log.Println("增量合并执行完成 ok", gtid, lteid, overid)
 	}
-
+	return overid
 }
 
 //定时任务  新增
@@ -387,19 +392,10 @@ func TimedTaskWinner() {
 					rdb.Do("SELECT", redis_winner_db)
 					if _, err := redis.String(rdb.Do("GET", errwinner)); err == nil {
 						//redis存在发送udp进行处理
-						by, _ := json.Marshal(map[string]interface{}{
-							"gtid":      tmpId,
-							"lteid":     tmpId,
-							"stype":     "",
-							"data_type": "winner",
-							"data_info": "add",
+						TaskWinner(&map[string]interface{}{
+							"gtid":  tmpId,
+							"lteid": tmpId,
 						})
-						if e := udpclient.WriteUdp(by, mu.OP_TYPE_DATA, &net.UDPAddr{
-							IP:   net.ParseIP("127.0.0.1"),
-							Port: Updport,
-						}); e != nil {
-							log.Println(e)
-						}
 						//存在的话删除tmp mongo表
 						FClient.DbName = Config["mgodb_extract_kf"]
 						if DeletedCount := FClient.Del("winner_new", bson.M{"_id": bson.ObjectIdHex(tmpId)}); !DeletedCount {
@@ -422,17 +418,30 @@ func TimedTaskWinner() {
 						//log.Println(r)
 						//人工审核正则
 						var isok bool
+						//先遍历ok
 						for _, v := range WinnerRegOk {
 							isok = v.MatchString(errwinner)
 							if isok {
-								tmp["winner_ok"] = 1
-								break
+								//匹配ok完,匹配err
+								for _, vRegErr := range WinnerRegErr {
+									isok = vRegErr.MatchString(errwinner)
+									//匹配到ok 也匹配到err 按err算
+									if isok {
+										tmp["winner_err"] = 1
+										break
+									}
+								}
+								//匹配ok，没匹配err 按ok算
+								if tmp["winner_err"] == nil {
+									tmp["winner_ok"] = 1
+									break
+								}
 							}
 						}
-						if tmp["winner_ok"] == nil {
+						//都没匹配
+						if tmp["winner_ok"] == nil  && tmp["winner_err"] == nil{
 							tmp["winner_err"] = 1
 						}
-
 						//匹配不到原始库,存入异常表删除临时表
 						FClient.DbName = Config["mgodb_extract_kf"]
 						if err := FClient.SaveForOld("winner_err", tmp); err != nil {
@@ -658,3 +667,8 @@ func TimedTaskWinner() {
 		t2.Reset(time.Minute)
 	}
 }
+
+//分包处理
+func PackageDealWith(contactMaps *[]interface{}, tmp map[string]interface{}) {
+
+}