Merge branch 'dev1.4' of http://192.168.3.207:10080/qmx/datatag into dev1.4

customerdata/src/config.json

@@ -3,7 +3,7 @@
   "dbsize": 10,
   "dbname": "datatag_ent",
   "tasktime": 1,
-  "latestid": "5f512d1fc0145440737580da",
+  "latestid": "5f1bf6c452c1d9fbf847319b",
   "buyerinfo": {
     "addr": "192.168.3.166:27082",
     "buyerentcoll": "buyer_ent",
@@ -32,7 +32,7 @@
   },
   "es": {
     "addr": "http://192.168.3.128:9800",
-    "index": "bidding_v5",
+    "index": "bidding_v1",
     "itype": "bidding",
     "pool": 15
   },
@@ -168,5 +168,12 @@
   "need_projectid_appid": [
     "jyMDBXQQIDCQBeSUdBITNf",
     "jyFApXQQIEAw5TTUZOMBpD"
-  ]
+  ],
+  "bidding_mgo": {
+    "addr": "192.168.3.207:27092",
+    "coll": "bidding",
+    "db": "qfw_data",
+    "size": 15
+  },
+  "file_downloadurl": "http://jy-datafile.oss-cn-beijing.aliyuncs.com/"
 }

customerdata/src/main.go

@@ -13,24 +13,26 @@ import (
 )
 
 type sysconfig struct {
-	Mgodb             string                 `json:"mgodb"`
-	DbSize            int                    `json:"dbsize"`
-	DbName            string                 `json:"dbname"`
-	TaskTime          int64                  `json:"tasktime"`
-	LatestId          string                 `json:"latestid"`
-	BuyerInfo         map[string]interface{} `json:"buyerinfo"`
-	Enterprise        map[string]interface{} `json:"enterprise"`
-	Save              map[string]interface{} `json:"save"`
-	Extract           map[string]interface{} `json:"extract"`
-	Es                map[string]interface{} `json:"es"`
-	RedisAddrs        string                 `json:"redis_addrs"`
-	ProjectAppid      []string               `json:"project_appid"`
-	SWinnerFilter     []string               `json:"s_winner_filter"`
-	CheckBidOpenAppid []string               `json:"checkbidopen_appid"`
-	DisPackageAppid   []string               `json:"dis_package_appid"`
-	DisPackageConfig  map[string]interface{} `json:"dis_package_config"`
+	Mgodb              string                 `json:"mgodb"`
+	DbSize             int                    `json:"dbsize"`
+	DbName             string                 `json:"dbname"`
+	TaskTime           int64                  `json:"tasktime"`
+	LatestId           string                 `json:"latestid"`
+	BuyerInfo          map[string]interface{} `json:"buyerinfo"`
+	Enterprise         map[string]interface{} `json:"enterprise"`
+	Save               map[string]interface{} `json:"save"`
+	Extract            map[string]interface{} `json:"extract"`
+	Es                 map[string]interface{} `json:"es"`
+	RedisAddrs         string                 `json:"redis_addrs"`
+	ProjectAppid       []string               `json:"project_appid"`
+	SWinnerFilter      []string               `json:"s_winner_filter"`
+	CheckBidOpenAppid  []string               `json:"checkbidopen_appid"`
+	DisPackageAppid    []string               `json:"dis_package_appid"`
+	DisPackageConfig   map[string]interface{} `json:"dis_package_config"`
 	CheckBidHrefRuleId []string               `json:"checkbidhref_ruleid"`
 	NeedProjectidAppid []string               `json:"need_projectid_appid"`
+	BiddingMgo         map[string]interface{} `json:"bidding_mgo"`
+	FileUrl            string                 `json:"file_downloadurl"`
 }
 
 var (
@@ -41,6 +43,7 @@ var (
 	MgoBuyer     *mongodb.MongodbSim //医院等级信息
 	MgoEnps      *mongodb.MongodbSim //企业信息
 	MgoExtract   *mongodb.MongodbSim //抽取
+	MgoBidding   *mongodb.MongodbSim //bidding表
 	SaveColl     string
 	HospColl     string
 	BuyerEntColl string
@@ -55,6 +58,7 @@ var (
 	CustomerName    string
 	SaveCollProject string
 	ExtractColl     string
+	BiddingColl     string
 )
 var MgoSaveCache = make(chan map[string]interface{}, 1000)
 var SP = make(chan bool, 5)
@@ -114,6 +118,16 @@ func init() {
 	}
 	MgoExtract.InitPool()
 
+	//bidding库
+	bidding := Sysconfig.BiddingMgo
+	BiddingColl = qu.ObjToString(bidding["coll"])
+	MgoBidding = &mongodb.MongodbSim{
+		MongodbAddr: qu.ObjToString(bidding["addr"]),
+		DbName:      qu.ObjToString(bidding["db"]),
+		Size:        qu.IntAll(bidding["size"]),
+	}
+	MgoBidding.InitPool()
+
 	//es
 	es := Sysconfig.Es
 	Es = &elastic.Elastic{

customerdata/src/task.go

@@ -167,6 +167,7 @@ func (c *Customer) GetData(stype string) {
 			}
 			//查询条件类型转换
 			var q es.Query
+			//sr.EsQuery = `{"query":{"filtered":{"filter":{"bool":{"must":[{"bool":{"should":[{"terms":{"city":["上海市"]}}]}},{"terms":{"toptype":["招标","结果"]}},{"range":{"publishtime":{"gte":1588262400,"lt":1608825600}}}]}},"query":{"bool":{"must":[{"bool":{"should":[{"bool":{"must":[{"bool":{"should":[{"bool":{"must":[{"terms":{"buyer":["上海城建职业学院","上海市第一人民医院","中国银联股份有限公司","上海立信会计金融学院法规处","中国东方航空股份有限公司","上海外国语大学","上海小昆山环卫服务有限公司","国家税务总局上海市税务局","中国浦东干部学院","上海市浦东新区老港镇人民政府","咪咕视讯科技有限公司","上海交通大学医学院附属新华医院","交通运输部上海打捞局","松江区体育局","复旦大学附属中山医院","上海交通大学医学院附属瑞金医院","中国科学院上海应用物理研究所"]}}]}}]}}]}}]}}],"must_not":[{"constant_score":{"filter":{"missing":{"field":"filetext"}}}}]}}}}}`
 			tmpQuery := es.BoolQuery{
 				QueryStrings: sr.EsQuery,
 			}

customerdata/src/util.go

@@ -664,6 +664,28 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 			tmp["projectId"] = ""
 		}
 	}*/
+	//匹配公告附件
+	filesArr := []map[string]interface{}{}
+	info := MgoBidding.FindOne(BiddingColl, map[string]interface{}{"_id": mongodb.StringTOBsonId(id)})
+	if info != nil && len(info) > 0 {
+		if info["projectinfo"] != nil {
+			projectInfo := qu.ObjToMap(info["projectinfo"])
+			if (*projectInfo)["attachments"] != nil {
+				fileUrl := Sysconfig.FileUrl
+				attachments := (*projectInfo)["attachments"].(map[string]interface{})
+				for _, v := range attachments {
+					atta := v.(map[string]interface{})
+					fileMap := map[string]interface{}{
+						"filename": atta["filename"],
+						"url":      fileUrl + qu.ObjToString(atta["ossid"]),
+					}
+					filesArr = append(filesArr, fileMap)
+				}
+			}
+		}
+	}
+	log.Println("查询附件结果：", id, len(filesArr))
+	tmp["files"] = filesArr
 	redis.Put("datag", appid+"_"+id, 1, 3*24*60*60)
 	MgoSaveCache <- tmp
 	return true