From f25b26618a1517a03a89aed17f570d5839a85b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E4=BC=9F?= <wangzhiwei@igengmei.com>
Date: Fri, 28 Dec 2018 20:09:11 +0800
Subject: [PATCH] =?UTF-8?q?smart=5Frank=20=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8C=87=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/scala/com/gmei/temp_analysis.scala   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/eda/feededa/src/main/scala/com/gmei/temp_analysis.scala b/eda/feededa/src/main/scala/com/gmei/temp_analysis.scala
index 5a80d5e5..bfb755a3 100644
--- a/eda/feededa/src/main/scala/com/gmei/temp_analysis.scala
+++ b/eda/feededa/src/main/scala/com/gmei/temp_analysis.scala
@@ -655,13 +655,13 @@ object smart_rank_count {
 
       val meigou_pv_count = sc.sql(
         s"""
-           |select meigou_city,count(device_id) as meigou_pv,count(distinct(device_id)) as meigou_device_num
+           |select '2018-12' as stat_date,meigou_city,count(device_id) as meigou_pv,count(distinct(device_id)) as meigou_device_num
            |from meigou_pv_tongcheng
            |where device_city = meigou_city
            |group by meigou_city
        """.stripMargin
       )
-      meigou_pv_count.show()
+      meigou_pv_count.createOrReplaceTempView("meigou_pv_count")
 
 
 //开始计算咨询
@@ -689,13 +689,24 @@ object smart_rank_count {
 
       val zixun_pv_count = sc.sql(
         s"""
-           |select meigou_city,count(device_id) as meigou_zixun,count(distinct(device_id)) as meigou_zixun_device_num
+           |select '2018-12' as stat_date,meigou_city,count(device_id) as meigou_zixun,count(distinct(device_id)) as meigou_zixun_device_num
            |from zixun_meigou_tongcheng
            |where device_city=meigou_city
            |group by meigou_city
        """.stripMargin
       )
-      zixun_pv_count.show()
+      zixun_pv_count.createOrReplaceTempView("zixun_pv_count")
+
+      val all_count = sc.sql(
+        s"""
+           |select mc.stat_date,mc.meigou_city,mc.meigou_pv,mc.meigou_device_num,zc.meigou_zixun,zc.meigou_zixun_device_num
+           |from meigou_pv_count mc left join zixun_pv_count zc
+           |on mc.meigou_city = zc.meigou_city
+       """.stripMargin
+      )
+      all_count.show()
+
+
 
 
 
-- 
2.18.0