Merge branch 'feature/v1.5.13' of jianyu/datatools into feature/v1.5.15

clueSync/main.go

@@ -127,6 +127,7 @@ func main() {
 	MgoQyxy = mongodb.NewMgoWithUser(db.MgoQyxy.Address, db.MgoQyxy.DbName, db.MgoQyxy.User, db.MgoQyxy.Password, db.MgoQyxy.DbSize)
 	InitArea()
 	InitProduct(db.ProductArr)
+	tagAllSync()
 	//activeUsers() //取关重新关注处理
 	if *mode == 1 {
 		//30分钟一次
@@ -209,5 +210,4 @@ func main() {
 		users()
 		saleLeads()
 	}
-
 }

telemarketingEtl/entity/dwd_f_userbase_visit_info.go

@@ -79,10 +79,21 @@ func VisitInfoAdd(start, end int64) {
 					}
 					url_ := gconv.String(thisData["url"])
 					reg := regexp.MustCompile(".*article/content/(.*)\\.html")
+					portrait1reg := regexp.MustCompile(".*/swordfish/page_big_pc/unit_portrayal/(.*)")
+					portrait2reg := regexp.MustCompile(".*swordfish/page_big_pc/(.*)/ent_ser_portrait")
+					searchreg := regexp.MustCompile(".*jybx/core/(.*)/searchList")
 					contentnum := 0
+					portraitnum := 0
+					searchnum := 0
 					if reg.MatchString(url_) {
 						contentnum = 1
 					}
+					if portrait1reg.MatchString(url_) || portrait2reg.MatchString(url_) {
+						portraitnum = 1
+					}
+					if searchreg.MatchString(url_) {
+						searchnum = 1
+					}
 					createtime := gconv.Int64(thisData["date"])
 					starttime, endtime := getToday(createtime)
 					craetetimeStr := time.Unix(createtime, 0).Format(date.Date_Full_Layout)
@@ -98,15 +109,19 @@ func VisitInfoAdd(start, end int64) {
 					lock(userid).Lock()
 					defer lock(userid).Unlock()
 					if config.JianyuSubjectdb.CountBySql(`select count(1) from dwd_f_userbase_visit_info where userid = ? and createtime>= ? and createtime <?`, userid, starttime, endtime) > 0 {
-						if contentnum == 0 {
-							config.JianyuSubjectdb.UpdateOrDeleteBySql(`update dwd_f_userbase_visit_info set number = number+1,date =?,platform=? where userid = ? and createtime>= ? and createtime <?`, craetetimeStr, platform, userid, starttime, endtime)
-						} else {
+						if contentnum != 0 {
 							config.JianyuSubjectdb.UpdateOrDeleteBySql(`update dwd_f_userbase_visit_info set number = number+1,contentnum = contentnum + 1,date =?,platform=? where userid = ? and createtime>= ? and createtime <?`, craetetimeStr, platform, userid, starttime, endtime)
+						} else if portraitnum != 0 {
+							config.JianyuSubjectdb.UpdateOrDeleteBySql(`update dwd_f_userbase_visit_info set number = number+1,portraitnum = contentnum + 1,date =?,platform=? where userid = ? and createtime>= ? and createtime <?`, craetetimeStr, platform, userid, starttime, endtime)
+						} else if searchnum != 0 {
+							config.JianyuSubjectdb.UpdateOrDeleteBySql(`update dwd_f_userbase_visit_info set number = number+1,searchnum = contentnum + 1,date =?,platform=? where userid = ? and createtime>= ? and createtime <?`, craetetimeStr, platform, userid, starttime, endtime)
+						} else {
+							config.JianyuSubjectdb.UpdateOrDeleteBySql(`update dwd_f_userbase_visit_info set number = number+1,date =?,platform=? where userid = ? and createtime>= ? and createtime <?`, craetetimeStr, platform, userid, starttime, endtime)
 						}
 					} else {
 						config.JianyuSubjectdb.InsertBySql(`INSERT INTO dwd_f_userbase_visit_info
-														(userid,DATE, number, platform,createtime,contentnum)
-														VALUES (?,?,?,?,?,?)`, userid, craetetimeStr, 1, platform, craetetimeStr, contentnum)
+														(userid,DATE, number, platform,createtime,contentnum,portraitnum,searchnum)
+														VALUES (?,?,?,?,?,?)`, userid, craetetimeStr, 1, platform, craetetimeStr, contentnum, portraitnum, searchnum)
 					}
 					if uid != "" {
 						if config.JianyuSubjectdb.CountBySql(`select count(1) from dwd_f_crm_attribute_label where uid = ?`, uid) > 0 {
@@ -115,6 +130,7 @@ func VisitInfoAdd(start, end int64) {
 							config.JianyuSubjectdb.Insert("dwd_f_crm_attribute_label", map[string]interface{}{
 								"uid":             uid,
 								"last_login_time": craetetimeStr,
+								"updatetime":      time.Now().Format(time.DateTime),
 							})
 						}
 					}