zhaotx 1 год назад
Родитель
Сommit
54666a4183

+ 6 - 5
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/ReportsAdPushMapper.xml

@@ -41,12 +41,12 @@
         ) tb2
     </select>
     <select id="tmpTopMovie" resultType="java.util.Map">
-        select  case ot1.movie_source when 2 then movie_name else concat('欢瑞自制-', movie_name) end as movie_name,
+        select case ot1.movie_source when 2 then movie_name else concat('欢瑞自制-', movie_name) end as movie_name,
         ot1.rk, ot1.share_end_amount, ot1.end_amount,  ot2.cost_amount, ot2.real_cost_amount,
         concat(round(if(ifnull(cost_amount,0)=0, 0, end_amount/cost_amount*100), 2), '%') AS water_roi,
         concat(round(if(ifnull(real_cost_amount,0)=0, 0, share_end_amount/real_cost_amount*100), 2), '%') AS real_roi
         FROM
-        (select ifnull(tb2.movie_name, tb1.movie_id) as movie_name, tb2.movie_source,
+        (select ifnull(tb2.movie_name, tb1.movie_id) as movie_name, movie_source,
         rank() over (order by sum(end_amount) desc) as rk, sum(end_amount) as end_amount, sum(share_end_amount) as share_end_amount
         from
         (select
@@ -61,11 +61,12 @@
         order by end_amount desc
         ) tb1
         left join
-        (select distinct moive_id, movie_name, movie_source from deepthink.all_moive) tb2 on tb1.movie_id=tb2.moive_id
+        (select distinct moive_id, movie_name, movie_source from deepthink.all_moive union
+        select series_id, ifnull(replace(series_name,REGEXP_SUBSTR(series_name, '[0-9]+$'),''),series_name),4 from media_api.kuaishou_drama_series_info) tb2 on tb1.movie_id=tb2.moive_id
         group by movie_name order by rk limit 10) ot1
         left join
-        (select product_name, round(ifnull(sum(cost_amount),0),2) as cost_amount, sum(real_cost_amount) as real_cost_amount
-        from application.media_product_report_daily where stat_date=${date} group by product_name
+        (select ifnull(replace(product_name,REGEXP_SUBSTR(product_name, '[0-9]+$'),''),product_name) as product_name, round(ifnull(sum(cost_amount),0),2) as cost_amount, sum(real_cost_amount) as real_cost_amount
+        from application.media_product_report_daily where stat_date=${date} group by ifnull(replace(product_name,REGEXP_SUBSTR(product_name, '[0-9]+$'),''),product_name)
         ) ot2 on ot1.movie_name=ot2.product_name
         order by rk
     </select>

+ 13 - 13
job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/DateReportsPushServiceImpl.java

@@ -133,24 +133,24 @@ public class DateReportsPushServiceImpl implements IDateReportsPushService {
 
         List<String> userIds = Arrays.asList(
                 "44fbaed6" //zhaotx
-                ,"ebeeced9" //yumeng
-                ,"265g9ef1" //wangshu
-                ,"ee518161" //zhaozhicheng
-                ,"c5f6b59d" //yuyang
-                ,"d834552b" //hemenghao
-                ,"a3235a61" //louzijun
-                ,"58e7a98a"  //xsq
+//                ,"ebeeced9" //yumeng
+//                ,"265g9ef1" //wangshu
+//                ,"ee518161" //zhaozhicheng
+//                ,"c5f6b59d" //yuyang
+//                ,"d834552b" //hemenghao
+//                ,"a3235a61" //louzijun
+//                ,"58e7a98a"  //xsq
         );
         for (String userId : userIds) {
             sendToFeishu(token, template_variable, userId);
         }
 
-//        List<String> chatid = Arrays.asList(
-////                "oc_275f17aa4bf8fae649ef281a2b9250f6"
-//        );
-//        for (String chat : chatid) {
-//            sendToChatGroup(token, template_variable, chat);
-//        }
+        List<String> chatid = Arrays.asList(
+                "oc_275f17aa4bf8fae649ef281a2b9250f6"
+        );
+        for (String chat : chatid) {
+            sendToChatGroup(token, template_variable, chat);
+        }
     }
 
     private void sendToFeishu(String token, JSONObject template_variable, String receive_id) {