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

customerdata/src/config.json

@@ -159,7 +159,7 @@
       "name": "移动"
     }
   },
-  "checkbidhref_appid": [
-    "jyMDBXQQIDCQBeSUdBITNf"
+  "checkbidhref_ruleid": [
+    "123"
   ]
 }

customerdata/src/main.go

@@ -29,7 +29,7 @@ type sysconfig struct {
 	CheckBidOpenAppid []string               `json:"checkbidopen_appid"`
 	DisPackageAppid   []string               `json:"dis_package_appid"`
 	DisPackageConfig  map[string]interface{} `json:"dis_package_config"`
-	CheckBidHrefAppid []string               `json:"checkbidhref_appid"`
+	CheckBidHrefRuleId []string               `json:"checkbidhref_ruleid"`
 }
 
 var (
@@ -61,7 +61,7 @@ var projectIdMap sync.Map
 var projectAppidMap = map[string]bool{}
 var CheckBidOpenAppidMap = map[string]bool{}
 var DisPackageAppidMap = map[string]bool{}
-var CheckBidHrefAppidMap = map[string]bool{}
+var CheckBidHrefRuleIdMap = map[string]bool{}
 
 func init() {
 	qu.ReadConfig(&Sysconfig)
@@ -140,8 +140,8 @@ func init() {
 	for _, v := range Sysconfig.DisPackageAppid {
 		DisPackageAppidMap[v] = true
 	}
-	for _, v := range Sysconfig.CheckBidHrefAppid {
-		CheckBidHrefAppidMap[v] = true
+	for _, v := range Sysconfig.CheckBidHrefRuleId {
+		CheckBidHrefRuleIdMap[v] = true
 	}
 }
 func main() {

customerdata/src/task.go

@@ -221,7 +221,7 @@ func (c *Customer) GetData(stype string) {
 									}
 								}
 								//河南移动，过滤掉中国移动采购网招标数据
-								if CheckBidHrefAppidMap[c.AppId] {
+								if CheckBidHrefRuleIdMap[dm.ID] {
 									if strings.Contains(qu.ObjToString(tmp["href"]), "b2b.10086.cn") {
 										qu.Debug("跳过该条数据，公告原网址中包含 b2b.10086.cn，", id)
 										return
@@ -321,6 +321,9 @@ func (c *Customer) GetData(stype string) {
 										}
 									}
 								}
+								if len(sr.AW) == 0 {
+									IsMatch = true
+								}
 								/*
 									到此已经匹配完数据
 								*/

customerdata/src/util.go

@@ -571,7 +571,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, a
 		}
 	}
 	//河南移动
-	if CheckBidHrefAppidMap[appid] {
+	if DisPackageAppidMap[appid] {
 		projectId := GetProjectId(id)
 		if projectId != "" {
 			//projectIds := strings.Split(projectId, ",")

src/config.json

@@ -101,8 +101,8 @@
 		"222",
 		"jyPB1XQgsGBQNbQElICQNW"
 	],
-	"checkbidhref_appid": [
-		"jyMDBXQQIDCQBeSUdBITNf"
+	"checkbidhref_ruleid": [
+		"1234"
 	],
 	"dis_package_appid":[
 	    "111",

src/history/datamodel.go

@@ -78,7 +78,7 @@ var (
 	projectIdMap         = sync.Map{}
 	FileTextAppidMap     = map[string]bool{}
 	CheckBidOpenAppidMap = map[string]bool{}
-	CheckBidHrefAppidMap = map[string]bool{}
+	CheckBidHrefRuleIdMap = map[string]bool{}
 	DisPackageAppidMap   = map[string]bool{}
 )
 

src/history/historytask.go

@@ -48,7 +48,7 @@ func (this *HistoryData) HistoryTask(history_id string) {
 		if FileTextAppidMap[appId] {
 			isfile = true
 		}
-		if CheckBidHrefAppidMap[appId] {
+		if DisPackageAppidMap[appId] {
 			isHenanMobile = true
 		}
 		log.Println(isfile, isHenanMobile)

src/history/task.go

@@ -165,7 +165,7 @@ func (c *Customer) GetData(stype string) {
 									}
 								}
 								//河南移动，过滤掉中国移动采购网招标数据
-								if CheckBidHrefAppidMap[c.AppId] {
+								if CheckBidHrefRuleIdMap[dm.ID] {
 									if strings.Contains(qu.ObjToString(tmp["href"]), "b2b.10086.cn") {
 										qu.Debug("跳过该条数据，公告原网址中包含 b2b.10086.cn，", id)
 										return

src/history/util_history.go

@@ -34,6 +34,8 @@ var MatchType = map[string]interface{}{
 	"5": "projectname",
 	"6": "buyer",
 	"7": "s_winner",
+	"8": "buyer",
+	"9": "s_winner",
 }
 
 //加载排除词、附加词、关键词
@@ -487,7 +489,7 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 		}
 	}
 	//河南移动
-	if CheckBidHrefAppidMap[appid] {
+	if DisPackageAppidMap[appid] {
 		projectId := GetProjectId(id)
 		if projectId != "" {
 			//projectIds := strings.Split(projectId, ",")
@@ -555,6 +557,9 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 					}
 				}
 			}
+			if index == 1 {
+				GetWinnerType(qu.ObjToString(tmp["s_winner"]), tmp)
+			}
 			if len(indexdata) > 0 {
 				for _, v := range indexdata {
 					MgoSaveCache <- v
@@ -562,6 +567,8 @@ func AssembelSave(tmp map[string]interface{}, IsSearchHosp, IsSearchEnps bool, h
 					xlsxCount++
 				}
 			}
+		} else {
+			log.Println("查result为空id：", id)
 		}
 	}
 	if isDup == 1 {
@@ -1169,8 +1176,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					ids := SE.EncodeString(qu.ObjToString(v["id"])) //唯一标识
 					row.AddCell().SetValue(ids)
 					row.AddCell().SetValue(SE.EncodeString(qu.ObjToString(v["projectId"]))) //项目标识
+					row.AddCell().SetValue(v["jybxhref"])                                   //剑鱼标讯地址
 
-					//row.AddCell().SetValue(v["jybxhref"])
 					//row.AddCell().SetValue(v["projectcode"])
 				}
 				xf.Sheets = xf.Sheets[4:5]
@@ -1272,29 +1279,33 @@ func checkBidId(appid, id string) bool {
 
 func GetWinnerType(s_winner string, v map[string]interface{}) {
 	isMatch := false
-	for _, vs := range Sysconfig["dis_package_config"].(map[string]interface{}) {
-		vvs := vs.(map[string]interface{})
-		keyWord := qu.ObjToString(vvs["keyWord"])
-		exclued := qu.ObjToString(vvs["exclued"])
-		name := qu.ObjToString(vvs["name"])
-		for _, key := range strings.Split(keyWord, ",") {
-			if strings.Contains(s_winner, key) {
-				isMatch = true
-				if exclued != "" {
-					for _, keys := range strings.Split(exclued, ",") {
-						if strings.Contains(s_winner, keys) {
-							isMatch = false
+	if s_winner != "" {
+		for _, vs := range Sysconfig["dis_package_config"].(map[string]interface{}) {
+			vvs := vs.(map[string]interface{})
+			keyWord := qu.ObjToString(vvs["keyWord"])
+			exclued := qu.ObjToString(vvs["exclued"])
+			name := qu.ObjToString(vvs["name"])
+			for _, key := range strings.Split(keyWord, ",") {
+				if strings.Contains(s_winner, key) {
+					isMatch = true
+					if exclued != "" {
+						for _, keys := range strings.Split(exclued, ",") {
+							if strings.Contains(s_winner, keys) {
+								isMatch = false
+							}
 						}
 					}
 				}
 			}
+			if isMatch {
+				v["winner_type"] = name
+				break
+			}
 		}
-		if isMatch {
-			v["winner_type"] = name
-			break
+		if !isMatch {
+			v["winner_type"] = "集成商"
 		}
-	}
-	if !isMatch {
-		v["winner_type"] = "集成商"
+	} else {
+		v["winner_type"] = ""
 	}
 }

src/main.go

@@ -68,8 +68,8 @@ func init() {
 	for _, s := range util.Sysconfig["checkbidopen_appid"].([]interface{}) {
 		history.CheckBidOpenAppidMap[s.(string)] = true
 	}
-	for _, v := range util.Sysconfig["checkbidhref_appid"].([]interface{}) {
-		history.CheckBidHrefAppidMap[v.(string)] = true
+	for _, v := range util.Sysconfig["checkbidhref_ruleid"].([]interface{}) {
+		history.CheckBidHrefRuleIdMap[v.(string)] = true
 	}
 	for _, v := range util.Sysconfig["dis_package_appid"].([]interface{}) {
 		history.DisPackageAppidMap[v.(string)] = true

src/service/customer_service.go

@@ -408,7 +408,7 @@ func (c *Customer) SynEuser() {
 	for _, v := range *ruleMap {
 		idAndSet := []map[string]interface{}{}
 		idAndSet = append(idAndSet, bson.M{"_id": v["_id"]}) //查询条件
-		idAndSet = append(idAndSet, v)                       //修改的数据
+		idAndSet = append(idAndSet, v)                                          //修改的数据
 		update2 = append(update2, idAndSet)
 	}
 	b = Mgo.UpSertBulk("euserdepartrule", update2...)
@@ -614,7 +614,7 @@ func (c *Customer) EuserRule1() {
 	data, _ := Mgo.FindOneByField("euserdepartrule", query, `{}`)
 	(*data)["id"] = mongoutil.BsonIdToSId((*data)["_id"])
 	var existfields = []string{}
-	if _,ok:=(*data)["s_existfields"];ok{
+	if _, ok := (*data)["s_existfields"]; ok {
 		s_existfields := (*data)["s_existfields"].(string)
 		for _, m := range strings.Split(s_existfields, ",") {
 			res, _ := Mgo.FindOne("code_field", map[string]interface{}{

src/service/second_push.go

@@ -620,8 +620,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					ids := SE.EncodeString(qu.ObjToString(v["id"])) //唯一标识
 					row.AddCell().SetValue(ids)
 					row.AddCell().SetValue(SE.EncodeString(qu.ObjToString(v["projectId"]))) //项目标识
-
-					//row.AddCell().SetValue(v["jybxhref"])
+					row.AddCell().SetValue(v["jybxhref"])
 					//row.AddCell().SetValue(v["projectcode"])
 				}
 				xf.Sheets = xf.Sheets[4:5]