apple il y a 5 ans
Parent
commit
c8048449c4
2 fichiers modifiés avec 61 ajouts et 6 suppressions
  1. 53 1
      udpfilterdup/src/README.md
  2. 8 5
      udpfilterdup/src/main.go

+ 53 - 1
udpfilterdup/src/README.md

@@ -1 +1,53 @@
-基于内存的信息重复过滤
+基于内存的信息重复过滤
+
+{
+    "udpport": ":1485",
+    "dupdays": 5,
+    "mongodb": {
+        "addr": "172.17.4.187:27083",
+        "pool": 10,
+        "db": "qfw",
+        "extract": "result_file_20200410_test",
+        "extract_back": "result_file_20200409",
+        "site": {
+            "dbname": "qfw",
+            "coll": "site"
+        }
+    },
+    "jkmail": {
+        "to": "zhangjinkun@topnet.net.cn",
+        "api": "http://10.171.112.160:19281/_send/_mail"
+    },
+    "nextNode": [
+        {
+            "addr": "172.17.145.179",
+            "port": 1782,
+            "stype": "project",
+            "memo": "合并项目"
+        },
+        {
+            "addr": "127.0.0.1",
+            "port": 1783,
+            "stype": "bidding",
+            "memo": "创建招标数据索引new"
+        }
+    ],
+    "threads": 1,
+    "isMerger": false,
+    "isSort":false,
+    "lowHeavy":false,
+    "timingTask":true,
+    "timingSpanDay": 2,
+    "timingPubScope": 360,
+    "specialwords": "(重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研)",
+    "specialtitle_0": "(包|标段|标包)[((]?[0-9a-zA-Z一二三四五六七八九十零123456789][))]?",
+    "specialtitle_1": "[0-9a-zA-Z一二三四五六七八九十零123456789](次|包|标段|标包|批)",
+    "specialtitle_2": "项目[((][0-9a-zA-Z一二三四五六七八九十零123456789][))]",
+    "beifen": "[((]?[0-9一二三四五六七八九十零123456789再][))]?[子分]?[次批标包]|重招|重新招标|勘察|设计|施工|监理|总承包|土石方|可研"
+}
+
+
+
+
+
+

+ 8 - 5
udpfilterdup/src/main.go

@@ -102,7 +102,7 @@ func init() {
 		}
 		SiteMap[util.ObjToString(site_dict["site"])] = data_map
 	}
-	log.Printf("站点加载用时:%d秒,%d个\n", int(time.Now().Unix())-start, len(SiteMap))
+	log.Printf("new站点加载用时:%d秒,%d个\n", int(time.Now().Unix())-start, len(SiteMap))
 }
 
 func main() {
@@ -110,7 +110,6 @@ func main() {
 	//TestXiuFu()
 	//
 	//return
-
 	go checkMapJob()
 	updport := Sysconfig["udpport"].(string)
 	udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
@@ -655,20 +654,22 @@ func historyTask(data []byte, mapInfo map[string]interface{}) {
 
 //定时任务
 func timedTaskDay() {
+	log.Println("部署定时任务")
 	c := cron.New()
 	c.AddFunc("0 0 1 * * ?", func() { movedata() })      //每天凌晨1点执行一次
 	c.AddFunc("0 0 2 * * ?", func() { timedTaskOnce() }) //每天凌晨2点执行一次
 	c.Start()
-	timedTaskOnce()
+	//timedTaskOnce()
 }
 func timedTaskOnce() {
 
 	log.Println("开始一次定时任务")
+
 	defer util.Catch()
 
 	now := time.Now()
-	preTime := time.Date(now.Year(), now.Month(), now.Day()-2, 0, 0, 0, 0, time.Local)
-	curTime := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, time.Local)
+	preTime := time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, time.Local)
+	curTime := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local)
 	task_sid := util.BsonIdToSId(bson.NewObjectIdWithTime(preTime))
 	task_eid := util.BsonIdToSId(bson.NewObjectIdWithTime(curTime))
 
@@ -877,6 +878,8 @@ func timedTaskOnce() {
 		}
 	}
 
+
+
 	if len(updateExtract) > 0 {
 		mgo.UpSertBulk(extract, updateExtract...)
 	}