Commit dc41f486 by hejiangming

uk de不计算属性

parent a01019d2
...@@ -592,6 +592,9 @@ class DwtAbaStAnalytics(Templates): ...@@ -592,6 +592,9 @@ class DwtAbaStAnalytics(Templates):
# self.df_history_st.show(10, truncate=True) # self.df_history_st.show(10, truncate=True)
# 读 dws_st_theme 计算搜索词属性标签 st_attribute_label # 读 dws_st_theme 计算搜索词属性标签 st_attribute_label
# 【为什么加站点判断】st_attribute_label 只有 us 计算 因为属性是基于us统计 业务要求 uk de不展示 这里填充默认值
# 非 us 直接跳过读取,st_attribute_label 在 handle_data 里统一填占位 '-1'(Java 转 null 返前端)。
if self.site_name == 'us':
has_theme_data = self.spark.sql(f""" has_theme_data = self.spark.sql(f"""
SELECT 1 FROM dws_st_theme SELECT 1 FROM dws_st_theme
WHERE site_name='{self.site_name}' WHERE site_name='{self.site_name}'
...@@ -712,8 +715,13 @@ class DwtAbaStAnalytics(Templates): ...@@ -712,8 +715,13 @@ class DwtAbaStAnalytics(Templates):
if self.date_type == 'month': if self.date_type == 'month':
self.handle_first_ever_flag() self.handle_first_ever_flag()
self.handle_peak_month() self.handle_peak_month()
# st_attribute_label 只有 us 计算
# 非 us(uk/de)不 join、直接填占位 '-1',与非 month 流程同款(Java 转 null 返前端)
if self.site_name == 'us':
self.df_save = self.df_save.join(self.df_st_attribute, on='search_term', how='left') self.df_save = self.df_save.join(self.df_st_attribute, on='search_term', how='left')
self.df_st_attribute.unpersist() self.df_st_attribute.unpersist()
else:
self.df_save = self.df_save.withColumn('st_attribute_label', F.lit('-1'))
self.df_save = self.df_save.join(self.df_st_filter, on='search_term', how='left') self.df_save = self.df_save.join(self.df_st_filter, on='search_term', how='left')
self.df_st_filter.unpersist() self.df_st_filter.unpersist()
else: else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment