duxin 2 miesięcy temu
rodzic
commit
c7317b411c
3 zmienionych plików z 31 dodań i 19 usunięć
  1. 8 5
      config.yaml
  2. 4 4
      manager/columnCron.go
  3. 19 10
      manager/manager.go

+ 8 - 5
config.yaml

@@ -3,23 +3,24 @@ database:
 #    link: "mysql:root:=PDT49#80Z!RVv52_z@tcp(192.168.3.14:4000)/seo_words"
 #    debug: true
   default:
-    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo?dial_timeout=2000ms&max_execution_time=60000"
-    debug: true
+#    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo?dial_timeout=2000ms&max_execution_time=60000"
+    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(172.20.45.129:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
+    debug: false
 
 logger:
   path: "log/"   # 日志文件路径。默认为空,表示关闭,仅输出到终端
   file: "{Y-m-d}.log" # 日志文件格式。默认为"{Y-m-d}.log"
 
 mongodb:
-  address: "192.168.3.206:27002"
+  address: "172.20.45.129:27002,172.20.45.130:27080"
   size: 5
   dbName: "qfw_data"
   replSet: ""
   collection: "bidding"
   collection_back: "bidding_back"
   collection_hot: "bidding_hots"
-  userName: "jyDevGroup"
-  password: "jy@DevGroup"
+#  userName: "jyDevGroup"
+#  password: "jy@DevGroup"
 
 proposedDb:
   address: "172.17.4.85:27080"
@@ -82,3 +83,5 @@ script:
     regionalCity: 16
     upRegionalCity: 2
     tableName: column_bidList
+
+propertyCooperationTags: 99

+ 4 - 4
manager/columnCron.go

@@ -264,7 +264,7 @@ func (job *columnJob) ColumnCron(ctx context.Context) {
 			if len(dArr) > 100 {
 				total += len(dArr)
 				//g.DB().Model(job.tableName).Ctx(ctx).WhereIn("bid_id", bidIDs).Delete()
-				if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM %s_do ON CLUSTER cluster WHERE bid_id in ('%s')", job.tableName, strings.Join(bidIDs, `','`))); err == nil {
+				if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM %s_do on CLUSTER default_cluster WHERE bid_id in ('%s')", job.tableName, strings.Join(bidIDs, `','`))); err == nil {
 					g.DB().Insert(ctx, job.tableName, dArr)
 				}
 				bidIDs, dArr = []string{}, []ColumnMsg{}
@@ -275,7 +275,7 @@ func (job *columnJob) ColumnCron(ctx context.Context) {
 	if len(dArr) > 0 {
 		total += len(dArr)
 		//g.DB().Model(job.tableName).Ctx(ctx).WhereIn("bid_id", bidIDs).Delete()
-		if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM %s_do ON CLUSTER cluster WHERE bid_id in ('%s')", job.tableName, strings.Join(bidIDs, `','`))); err == nil {
+		if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM %s_do on CLUSTER default_cluster WHERE bid_id in ('%s')", job.tableName, strings.Join(bidIDs, `','`))); err == nil {
 			g.DB().Insert(ctx, job.tableName, dArr)
 		}
 	}
@@ -315,7 +315,7 @@ func SaveBidSign(ctx context.Context, arr []*BidSign) {
 func DelBidSign(ctx context.Context, arr []string) {
 	//保存至数据库
 	//g.DB().Model("new_bid_sign").Ctx(ctx).WhereIn("bid_id", arr).Delete()
-	if _, err := g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM new_bid_sign_do ON CLUSTER cluster WHERE bid_id in ('%s')", strings.Join(arr, `','`))); err != nil {
+	if _, err := g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM new_bid_sign_do on CLUSTER default_cluster WHERE bid_id in ('%s')", strings.Join(arr, `','`))); err != nil {
 		g.Log().Errorf(ctx, "DelBidSign err:%v\n", err.Error())
 	}
 }
@@ -333,7 +333,7 @@ func RepeatIds(ctx context.Context) {
 		if len(repeatIds) == 100 || k == count {
 			g.Log().Infof(ctx, "删除重复id %v", repeatIds)
 			//g.DB().Delete(context.Background(), "new_bid_sign", "bid_id IN (?)", strings.Join(repeatIds, ","))
-			if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM new_bid_sign_do ON CLUSTER cluster WHERE bid_id in ('%s')", strings.Join(repeatIds, `','`))); err != nil {
+			if _, err = g.DB().Exec(ctx, fmt.Sprintf("DELETE FROM new_bid_sign_do on CLUSTER default_cluster WHERE bid_id in ('%s')", strings.Join(repeatIds, `','`))); err != nil {
 				g.Log().Errorf(ctx, "RepeatIds err:%v\n", err.Error())
 			}
 			repeatIds = []string{}

+ 19 - 10
manager/manager.go

@@ -23,11 +23,12 @@ type runManager struct {
 }
 
 var (
-	GobalManager = NewMatch(context.Background())
-	filterSpace  = regexp.MustCompile("<[^>]*?>|[\\s\u3000\u2003\u00a0]")
-	detailFilter []*regexp.Regexp
-	detailMax    = g.Cfg().MustGet(context.Background(), "runData.detailMax", 500).Int()
-	staTime      = g.Cfg().MustGet(context.Background(), "runData.staTime", 18).Int()
+	GobalManager            = NewMatch(context.Background())
+	filterSpace             = regexp.MustCompile("<[^>]*?>|[\\s\u3000\u2003\u00a0]")
+	detailFilter            []*regexp.Regexp
+	detailMax               = g.Cfg().MustGet(context.Background(), "runData.detailMax", 500).Int()
+	staTime                 = g.Cfg().MustGet(context.Background(), "runData.staTime", 18).Int()
+	propertyCooperationTags = g.Cfg().MustGet(context.Background(), "propertyCooperationTags", 99).Uint32()
 )
 
 const (
@@ -186,11 +187,13 @@ func GetBidSign(ctx context.Context, st, et int64) {
 		"pici":       bson.M{"$gte": st, "$lt": et},
 	}
 	it := sess.DB(db.MongdbConf.DbName).C(db.MongdbConf.Collection).Find(query).Select(map[string]interface{}{
-		"_id":         1,
-		"nav_column":  1,
-		"publishtime": 1,
-		"area":        1,
-		"city":        1,
+		"_id":                1,
+		"nav_column":         1,
+		"publishtime":        1,
+		"area":               1,
+		"city":               1,
+		"subtype":            1,
+		"tag_topinformation": 1,
 	}).Iter()
 	var (
 		bidSignArr []*BidSign
@@ -208,6 +211,12 @@ func GetBidSign(ctx context.Context, st, et int64) {
 			row = map[string]interface{}{}
 			continue
 		}
+		for _, s := range gconv.Strings(cMap["tag_topinformation"]) {
+			if s == "情报_物业" && gconv.String(cMap["subtype"]) == "合同" {
+				navColumn = append(navColumn, propertyCooperationTags)
+				break
+			}
+		}
 		bs := &BidSign{
 			Bid_id:       mongodb.BsonIdToSId(cMap["_id"]),
 			Area:         gconv.String(cMap["area"]),