xuzhiheng 5 vuotta sitten
vanhempi
commit
89b225c671
5 muutettua tiedostoa jossa 99 lisäystä ja 80 poistoa
  1. 0 0
      customerdata/src/config.json
  2. 17 12
      customerdata/src/main.go
  3. 11 0
      customerdata/src/task.go
  4. 70 68
      src/history/datamodel.go
  5. 1 0
      src/history/task.go

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
customerdata/src/config.json


+ 17 - 12
customerdata/src/main.go

@@ -13,18 +13,19 @@ 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"`
-	Es            map[string]interface{} `json:"es"`
-	RedisAddrs    string                 `json:"redis_addrs"`
-	ProjectAppid  []string               `json:"project_appid"`
-	SWinnerFilter []string               `json:"s_winner_filter"`
+	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"`
+	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"`
 }
 
 var (
@@ -52,6 +53,7 @@ var MgoSaveCache = make(chan map[string]interface{}, 1000)
 var SP = make(chan bool, 5)
 var projectIdMap sync.Map
 var projectAppidMap = map[string]bool{}
+var CheckBidOpenAppidMap = map[string]bool{}
 
 func init() {
 	qu.ReadConfig(&Sysconfig)
@@ -115,6 +117,9 @@ func init() {
 	for _, v := range Sysconfig.ProjectAppid {
 		projectAppidMap[v] = true
 	}
+	for _, v := range Sysconfig.CheckBidOpenAppid {
+		CheckBidOpenAppidMap[v] = true
+	}
 }
 func main() {
 	go SaveMgo()

+ 11 - 0
customerdata/src/task.go

@@ -209,6 +209,17 @@ func (c *Customer) GetData(stype string) {
 									}
 								}
 								id := qu.ObjToString(tmp["_id"])
+								//亚信
+								if CheckBidOpenAppidMap[c.AppId] {
+									if tmp["bidopentime"] != nil {
+										bidopentime := qu.Int64All(tmp["bidopentime"])
+										comeintime := qu.Int64All(tmp["comeintime"])
+										if bidopentime-comeintime <= 7*24*60*60 {
+											qu.Debug("跳过该条数据,开标时间-入库时间<=7天,", id)
+											return
+										}
+									}
+								}
 								isExists, err := redis.Exists("datag", c.AppId+"_"+id)
 								if err != nil {
 									log.Println("redis信息id判重出错 ", err)

+ 70 - 68
src/history/datamodel.go

@@ -8,74 +8,76 @@ import (
 	"gopkg.in/mgo.v2/bson"
 )
 
-var MgoSaveCache = make(chan map[string]interface{}, 1000)
-var xlsxArr []map[string]interface{}
-var SP = make(chan bool, 5)
-var xlsxCount = 0
-var SE = util.SimpleEncrypt{Key: "topJYBX2019"}
-var FielsArr = map[string]interface{}{
-	"title":            "公告标题",
-	"content":          "公告内容",
-	"href":             "公告地址",
-	"jybxhref":         "剑鱼标讯地址",
-	"detail":           "公告正文",
-	"area":             "省份",
-	"city":             "城市",
-	"publishtime":      "发布时间",
-	"projectname":      "项目名称",
-	"projectcode":      "项目编号",
-	"buyer":            "采购单位",
-	"buyerperson":      "采购单位联系人",
-	"buyertel":         "采购单位联系电话",
-	"budget":           "预算(元)",
-	"bidopentime":      "开标日期",
-	"s_winner":         "中标单位",
-	"bidamount":        "中标价(元)",
-	"agency":           "招标机构",
-	"projectscope":     "项目范围",
-	"currency":         "币种",
-	"subtype":          "公告类别",
-	"toptype":          "公告类别大类",
-	"id":               "信息标识",
-	"industry":         "行业",
-	"matchkey":         "信息匹配词",
-	"matchtype":        "匹配字段",
-	"priority":         "信息重要程度",
-	"department":       "部门",
-	"excludetype":      "排除类型",
-	"winner_organcode": "中标单位代码",
-	"winner_phone":     "中标单位电话",
-	"subscopeclass":    "信息二级分类",
-	"winner":           "中标单位",
-	"winner_county":    "中标单位县区",
-	"winner_address":   "中标单位地址",
-	"winner_city":      "中标单位城市",
-	"winner_time":      "中标时间",
-	"bid2017":          "2017年中标数",
-	"bid2018":          "2018年中标数",
-	"bid2019":          "2019年中标数",
-	"bid2020":          "2020年中标数",
-	"winner_credit_no": "中标单位征信代码",
-	"buyer_credit_no":  "招标客户征信代码",
-	"stock_name":       "股东名单",
-	"business_scope":   "经营范围",
-	"establish_date":   "注册时间",
-	"capital":          "注册资金",
-	"winneraddr":       "中标单位的注册地址",
-	"purchasing":       "中标产品信息",
-	"rank":             "医院等级",
-	"winnertel":        "中标单位联系电话(公告)",
-	"winnerperson":     "中标单位联系人(公告)",
-	"district":         "区县",
-	"legal_person":     "中标单位联系人(公示网站)",
-	"company_phone":    "中标单位联系电话(公示网站)",
-	"company_email":    "中标单位电子邮箱(公示网站)",
-	"company_address":  "中标单位注册地址(公示网站)",
-	"tagname":          "标签名称",
-}
-var ProjectAppidMap = map[string]bool{}
-var projectIdMap = sync.Map{}
-var FileTextAppidMap = map[string]bool{}
+// var FielsArr = map[string]interface{}{
+// 	"title":            "公告标题",
+// 	"content":          "公告内容",
+// 	"href":             "公告地址",
+// 	"jybxhref":         "剑鱼标讯地址",
+// 	"detail":           "公告正文",
+// 	"area":             "省份",
+// 	"city":             "城市",
+// 	"publishtime":      "发布时间",
+// 	"projectname":      "项目名称",
+// 	"projectcode":      "项目编号",
+// 	"buyer":            "采购单位",
+// 	"buyerperson":      "采购单位联系人",
+// 	"buyertel":         "采购单位联系电话",
+// 	"budget":           "预算(元)",
+// 	"bidopentime":      "开标日期",
+// 	"s_winner":         "中标单位",
+// 	"bidamount":        "中标价(元)",
+// 	"agency":           "招标机构",
+// 	"projectscope":     "项目范围",
+// 	"currency":         "币种",
+// 	"subtype":          "公告类别",
+// 	"toptype":          "公告类别大类",
+// 	"id":               "信息标识",
+// 	"industry":         "行业",
+// 	"matchkey":         "信息匹配词",
+// 	"matchtype":        "匹配字段",
+// 	"priority":         "信息重要程度",
+// 	"department":       "部门",
+// 	"excludetype":      "排除类型",
+// 	"winner_organcode": "中标单位代码",
+// 	"winner_phone":     "中标单位电话",
+// 	"subscopeclass":    "信息二级分类",
+// 	"winner":           "中标单位",
+// 	"winner_county":    "中标单位县区",
+// 	"winner_address":   "中标单位地址",
+// 	"winner_city":      "中标单位城市",
+// 	"winner_time":      "中标时间",
+// 	"bid2017":          "2017年中标数",
+// 	"bid2018":          "2018年中标数",
+// 	"bid2019":          "2019年中标数",
+// 	"bid2020":          "2020年中标数",
+// 	"winner_credit_no": "中标单位征信代码",
+// 	"buyer_credit_no":  "招标客户征信代码",
+// 	"stock_name":       "股东名单",
+// 	"business_scope":   "经营范围",
+// 	"establish_date":   "注册时间",
+// 	"capital":          "注册资金",
+// 	"winneraddr":       "中标单位的注册地址",
+// 	"purchasing":       "中标产品信息",
+// 	"rank":             "医院等级",
+// 	"winnertel":        "中标单位联系电话(公告)",
+// 	"winnerperson":     "中标单位联系人(公告)",
+// 	"district":         "区县",
+// 	"legal_person":     "中标单位联系人(公示网站)",
+// 	"company_phone":    "中标单位联系电话(公示网站)",
+// 	"company_email":    "中标单位电子邮箱(公示网站)",
+// 	"company_address":  "中标单位注册地址(公示网站)",
+// 	"tagname":          "标签名称",
+// }
+var (
+	MgoSaveCache     = make(chan map[string]interface{}, 1000)
+	xlsxArr          = []map[string]interface{}{}
+	SP               = make(chan bool, 5)
+	xlsxCount        = 0
+	SE               = util.SimpleEncrypt{Key: "topJYBX2019"}
+	ProjectAppidMap  = map[string]bool{}
+	projectIdMap     = sync.Map{}
+	FileTextAppidMap = map[string]bool{}
+)
 
 //客户模型
 type Customer struct {

+ 1 - 0
src/history/task.go

@@ -154,6 +154,7 @@ func (c *Customer) GetData(stype string) {
 									}
 								}
 								id := qu.ObjToString(tmp["_id"])
+								//
 								tmp["id"] = id //记录数据原有id
 								delete(tmp, "_id")
 								if sr.ExtFieldType == 2 {

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä