diff --git a/src/main/java/com/ycwl/basic/clickhouse/service/impl/ClickHouseStatsQueryServiceImpl.java b/src/main/java/com/ycwl/basic/clickhouse/service/impl/ClickHouseStatsQueryServiceImpl.java index df12d4da..f51ac016 100644 --- a/src/main/java/com/ycwl/basic/clickhouse/service/impl/ClickHouseStatsQueryServiceImpl.java +++ b/src/main/java/com/ycwl/basic/clickhouse/service/impl/ClickHouseStatsQueryServiceImpl.java @@ -86,11 +86,9 @@ public class ClickHouseStatsQueryServiceImpl implements StatsQueryService { sql.append("SELECT toInt32(uniqExact(s.member_id)) AS count "); sql.append("FROM t_stats_record r "); sql.append("INNER JOIN t_stats s ON r.trace_id = s.trace_id "); - sql.append("WHERE r.trace_id IN ("); - appendEnterScenicTraceIdSubQuery(sql, query.getScenicId(), query.getStartTime(), query.getEndTime()); - sql.append(") "); - sql.append("AND r.action = 'LOAD' "); + sql.append("WHERE r.action = 'LOAD' "); sql.append("AND r.identifier = 'pages/videoSynthesis/buy' "); + sql.append("AND JSONExtractString(r.params, 'scenicId') = '").append(query.getScenicId()).append("' "); sql.append("AND JSONExtractString(r.params, 'share') = '' "); if (query.getStartTime() != null) { sql.append("AND r.create_time >= ").append(formatDateTime(query.getStartTime())).append(" "); @@ -150,10 +148,8 @@ public class ClickHouseStatsQueryServiceImpl implements StatsQueryService { sql.append("SELECT toInt32(uniqExact(s.member_id)) AS count "); sql.append("FROM t_stats_record r "); sql.append("INNER JOIN t_stats s ON r.trace_id = s.trace_id "); - sql.append("WHERE r.trace_id IN ("); - appendEnterScenicTraceIdSubQuery(sql, query.getScenicId(), query.getStartTime(), query.getEndTime()); - sql.append(") "); - sql.append("AND r.action = 'FACE_UPLOAD' "); + sql.append("WHERE r.action = 'FACE_UPLOAD' "); + sql.append("AND JSONExtractString(r.params, 'scenicId') = '").append(query.getScenicId()).append("' "); if (query.getStartTime() != null) { sql.append("AND s.create_time >= ").append(formatDateTime(query.getStartTime())).append(" "); } @@ -168,10 +164,8 @@ public class ClickHouseStatsQueryServiceImpl implements StatsQueryService { StringBuilder sql = new StringBuilder(); sql.append("SELECT DISTINCT r.identifier FROM t_stats_record r "); sql.append("INNER JOIN t_stats s ON r.trace_id = s.trace_id "); - sql.append("WHERE r.trace_id IN ("); - appendEnterScenicTraceIdSubQuery(sql, query.getScenicId(), query.getStartTime(), query.getEndTime()); - sql.append(") "); - sql.append("AND r.action = 'FACE_UPLOAD' "); + sql.append("WHERE r.action = 'FACE_UPLOAD' "); + sql.append("AND JSONExtractString(r.params, 'scenicId') = '").append(query.getScenicId()).append("' "); if (query.getStartTime() != null) { sql.append("AND s.create_time >= ").append(formatDateTime(query.getStartTime())).append(" "); } diff --git a/src/main/resources/mapper/TaskMapper.xml b/src/main/resources/mapper/TaskMapper.xml index 1398a362..f4d90460 100644 --- a/src/main/resources/mapper/TaskMapper.xml +++ b/src/main/resources/mapper/TaskMapper.xml @@ -154,10 +154,9 @@