apple 5 년 전
부모
커밋
c13f4d81f1
4개의 변경된 파일17개의 추가작업 그리고 24개의 파일을 삭제
  1. 8 10
      udpfilterdup/src/config.json
  2. 1 1
      udpfilterdup/src/datamap.go
  3. 6 11
      udpfilterdup/src/main.go
  4. 2 2
      udps/main.go

+ 8 - 10
udpfilterdup/src/config.json

@@ -1,13 +1,13 @@
 {
-    "udpport": ":1112",
+    "udpport": ":1485",
     "dupdays": 2,
     "mongodb": {
-        "addr": "192.168.3.207:27082",
-        "pool": 5,
-        "db": "extract_kf",
-        "extract": "bidding_20190910_01",
-        "extract_copy": "bidding_20190910_01_copy",
-        "bidding": "bidding"
+        "addr": "172.17.145.163:27080",
+        "pool": 15,
+        "db": "qfw",
+        "extract": "result_20190906",
+        "extract_copy": "result_20190906",
+        "bidding": "bidding_126"
     },
     "jkmail": {
         "to": "renzheng@topnet.net.cn",
@@ -28,6 +28,4 @@
         }
     ],
     "specialwords": "[((]?[0-9一二三四五六七八九十零123456789再][))]?[子分]?[次批标包]|重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研"
-}
-
-
+}

+ 1 - 1
udpfilterdup/src/datamap.go

@@ -62,7 +62,7 @@ func NewDatamap(days int, lastid string) *datamap {
 	now1 := int64(0)
 	n, continuSum := 0, 0
 	for tmp := make(map[string]interface{}); it.Next(&tmp); n++ {
-		//|| qutil.ObjToString(tmp["subtype"]) == "变更"  //变更的数据打开
+		//|| qutil.ObjToString(tmp["subtype"]) == "变更"
 		if qutil.IntAll(tmp["repeat"]) == 1  {
 			continuSum++
 

+ 6 - 11
udpfilterdup/src/main.go

@@ -6,6 +6,7 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"gopkg.in/mgo.v2/bson"
 	"log"
@@ -30,7 +31,7 @@ var (
 	dupdays      = 5                      //初始化判重范围
 	DM           *datamap                 //判重数据
 	FilterRegexp = regexp.MustCompile("^_$")
-	lastid       = "5d767728a5cb26b9b7748868"  //起始数据1条
+	lastid       = ""  //起始数据1条
 
 
 	FilterRegTitle = regexp.MustCompile("[0-9一二三四五六七八九十零123456789](次|包|标段)")
@@ -42,9 +43,9 @@ var (
 )
 
 func init() {
-	//flag.StringVar(&lastid, "id", "", "最后加载id") //以小于等于此id开始加载最近几天的数据
-	//flag.Parse()// 类似于命令台 scanf
-	////172.17.145.163:27080
+	flag.StringVar(&lastid, "id", "", "最后加载id") //以小于等于此id开始加载最近几天的数据
+	flag.Parse()// 类似于命令台 scanf
+	//172.17.145.163:27080
 	util.ReadConfig(&Sysconfig)
 	nextNode = util.ObjArrToMapArr(Sysconfig["nextNode"].([]interface{}))
 	mconf = Sysconfig["mongodb"].(map[string]interface{})
@@ -72,7 +73,7 @@ func init() {
 }
 
 //新增一个方法 判断
-func main22()  {
+func mainTest()  {
 
 	sess := mgo.GetMgoConn()
 	defer mgo.DestoryMongoConn(sess)
@@ -243,13 +244,7 @@ func task(data []byte, mapInfo map[string]interface{}) {
 				b, id := DM.check(info)
 				if b { //有重复,生成更新语句,更新抽取和更新招标
 
-					//重复数据,处理方式   合并操作--------------
-					//重复数据,处理方式   合并操作--------------
-					//重复数据,处理方式   合并操作--------------
-
-
 					repeateN++
-					//log.Println("变更数据重复",tmp["_id"])
 					mapLock.Lock()
 					updateExtract = append(updateExtract, []map[string]interface{}{
 						map[string]interface{}{

+ 2 - 2
udps/main.go

@@ -30,8 +30,8 @@ func main() {
 	56404035af5374672e00059c
 	5d4da9c8a5cb26b9b7b6bbcd  100万
 	*/
-	flag.StringVar(&sid, "sid", "5d767728a5cb26b9b7748868", "开始id")
-	flag.StringVar(&eid, "eid", "5d77c881a5cb26b9b7de209d", "结束id")
+	flag.StringVar(&sid, "sid", "", "开始id")
+	flag.StringVar(&eid, "eid", "", "结束id")
 	flag.StringVar(&startDate, "start", "", "开始日期2006-01-02")
 	flag.StringVar(&endDate, "end", "", "结束日期2006-01-02")
 	flag.StringVar(&ip, "ip", "127.0.0.1", "ip")