|
@@ -174,18 +174,18 @@ func NewMatchObj(ctx context.Context, isRunHistory bool) *MatchObj {
|
|
|
|
|
|
func (o *MatchObj) Match(ctx context.Context, start, end time.Time) error {
|
|
|
//便利dwd_f_personnel_behavior表
|
|
|
- rows, err := clickIterSource.Ch_analysis.Query(ctx, "SELECT date,url,user_id,mini_program_code,action_id,breaker_name,page_id FROM dwd_f_personnel_behavior WHERE user_id!='' AND date>=? and date<? ", start.Format(time.DateTime), end.Format(time.DateTime))
|
|
|
+ rows, err := clickIterSource.Ch_analysis.Query(ctx, "SELECT date,url,user_id,mini_program_code,action_id,breaker_name,page_id,page_name FROM dwd_f_personnel_behavior WHERE user_id!='' AND date>=? and date<? ", start.Format(time.DateTime), end.Format(time.DateTime))
|
|
|
if err != nil {
|
|
|
return errors.Wrap(err, "加载日志数据异常")
|
|
|
}
|
|
|
defer rows.Close()
|
|
|
for rows.Next() {
|
|
|
var (
|
|
|
- date time.Time
|
|
|
- user_id, url, mini_program_code, action_id, breaker_name, page_id string
|
|
|
+ date time.Time
|
|
|
+ user_id, url, mini_program_code, action_id, breaker_name, page_id, page_name string
|
|
|
)
|
|
|
if err := rows.Scan(
|
|
|
- &date, &url, &user_id, &mini_program_code, &action_id, &breaker_name, &page_id,
|
|
|
+ &date, &url, &user_id, &mini_program_code, &action_id, &breaker_name, &page_id, &page_name,
|
|
|
); err != nil {
|
|
|
g.Log().Errorf(ctx, "字段映射异常 %v", err)
|
|
|
}
|
|
@@ -216,6 +216,10 @@ func (o *MatchObj) Match(ctx context.Context, start, end time.Time) error {
|
|
|
if !compareValue(page_id, val) {
|
|
|
return false
|
|
|
}
|
|
|
+ case "page_name":
|
|
|
+ if !compareValue(page_name, val) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return true
|